diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-08-23 14:58:09 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-08-23 14:58:09 +0200 |
| commit | 764c8ae639135eedd597a2eff9818daebbc128bb (patch) | |
| tree | e15f38847a0da36c911ec6db05c8206ffaac591c | |
| parent | b02a5883e2dd116455759d7fa9a649ac8739869a (diff) | |
| parent | 9bef8a5dc1149194413b6425a40e0a61d6f963b5 (diff) | |
| download | cgeo-764c8ae639135eedd597a2eff9818daebbc128bb.zip cgeo-764c8ae639135eedd597a2eff9818daebbc128bb.tar.gz cgeo-764c8ae639135eedd597a2eff9818daebbc128bb.tar.bz2 | |
Merge branch 'release'
| -rw-r--r-- | main/res/values-v19/themes.xml | 9 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/main/res/values-v19/themes.xml b/main/res/values-v19/themes.xml new file mode 100644 index 0000000..e5885c2 --- /dev/null +++ b/main/res/values-v19/themes.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:tools="http://schemas.android.com/tools"> + <style name="cgeo_main" parent="cgeo_main.base"> + + <!-- KitKat's transparent navigation --> + <item name="android:fitsSystemWindows">true</item> + <item name="android:windowTranslucentNavigation">true</item> + </style> +</resources>
\ No newline at end of file diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index 749cd48..ed478e2 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -17,16 +17,13 @@ <!-- system elements --> <item name="android:windowContentOverlay">@null</item> <item name="actionBarStyle">@style/cgeo_main.ActionBarStyle</item> + <item name="android:actionBarStyle" tools:ignore="NewApi">@style/cgeo_main.ActionBarStyle</item> - <!-- KitKat's transperent navigation --> - <item name="android:fitsSystemWindows">true</item> - <item name="android:windowTranslucentNavigation" tools:ignore="NewApi">true</item> - </style> + </style> <style name="cgeo_main" parent="cgeo_main.base"> - <item name="actionBarStyle">@style/cgeo_main.ActionBarStyle</item> - <item name="android:actionBarStyle" tools:ignore="NewApi">@style/cgeo_main.ActionBarStyle</item> + <!-- gets modified in v19 to add translucent window decoration --> </style> <style name="cgeo.Widget.AppCompat.Base.ProgressBar.Medium" parent="android:Widget.ProgressBar"> |