diff options
| author | MoNTE48 <MoNTE48@mail.ua> | 2019-11-07 00:39:39 +0100 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2019-11-09 11:24:49 +0100 |
| commit | 7f023de5cb2299f9ef9e1363afde414fe14ede51 (patch) | |
| tree | cc2a83e250755fb44fa4c4e9041d18a19713f966 /build/android/src/main/res | |
| parent | dfd5f7cb1034673fbdfd1603b6b13c9b59e47589 (diff) | |
| download | minetest-7f023de5cb2299f9ef9e1363afde414fe14ede51.tar.gz minetest-7f023de5cb2299f9ef9e1363afde414fe14ede51.tar.bz2 minetest-7f023de5cb2299f9ef9e1363afde414fe14ede51.zip | |
Android: build fixes & compat fixes
Diffstat (limited to 'build/android/src/main/res')
| -rw-r--r-- | build/android/src/main/res/values-v21/styles.xml | 13 | ||||
| -rw-r--r-- | build/android/src/main/res/values/styles.xml | 8 |
2 files changed, 14 insertions, 7 deletions
diff --git a/build/android/src/main/res/values-v21/styles.xml b/build/android/src/main/res/values-v21/styles.xml index 825ab1d37..8b0777467 100644 --- a/build/android/src/main/res/values-v21/styles.xml +++ b/build/android/src/main/res/values-v21/styles.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> - <style name="AppTheme" parent="@android:style/android:Theme.Material.Light.NoActionBar.Fullscreen"> + <style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar.Fullscreen"> <item name="android:windowNoTitle">true</item> - <item name="android:windowAnimationStyle">@null</item> <item name="android:windowBackground">@drawable/bg</item> + <item name="android:windowLayoutInDisplayCutoutMode" tools:ignore="NewApi" tools:targetApi="o_mr1"> + shortEdges + </item> </style> - <style name="Theme.Dialog" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar"/> + <style name="Theme.Dialog" parent="@android:style/Theme.Material.Light.Dialog.NoActionBar"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + </style> </resources> diff --git a/build/android/src/main/res/values/styles.xml b/build/android/src/main/res/values/styles.xml index 3e66ff4ba..1bd41ae76 100644 --- a/build/android/src/main/res/values/styles.xml +++ b/build/android/src/main/res/values/styles.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="AppTheme" parent="@android:style/android:Theme.Holo.Light.NoActionBar.Fullscreen"> + <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar.Fullscreen"> <item name="android:windowNoTitle">true</item> - <item name="android:windowAnimationStyle">@null</item> <item name="android:windowBackground">@drawable/bg</item> </style> - <style name="Theme.Dialog" parent="@android:style/android:Theme.Holo.Light.Dialog.NoActionBar"/> + <style name="Theme.Dialog" parent="android:Theme.Holo.Light.Dialog.NoActionBar"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + </style> </resources> |