diff options
author | Roman Romanov <rromanov@65gb.net> | 2016-11-03 12:19:38 +0300 |
---|---|---|
committer | Ilya Grechuhin <i.grechuhin@gmail.com> | 2016-11-11 11:06:00 +0300 |
commit | b26eaabd8afd7fcb07c3fed880da38727960b774 (patch) | |
tree | 499e484d1b5d2aade62cf6c3a0254bf3236b8bf4 /android/res/values | |
parent | 3e78928cbbfb8509bde96ecc21103a5ade1c4108 (diff) |
[android] Transparent statusbar.
Diffstat (limited to 'android/res/values')
-rw-r--r-- | android/res/values/themes-base.xml | 10 | ||||
-rw-r--r-- | android/res/values/themes.xml | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml index 95f722d747..f1053e3b2f 100644 --- a/android/res/values/themes-base.xml +++ b/android/res/values/themes-base.xml @@ -10,11 +10,13 @@ <item name="android:textColorSecondary">@color/text_dark_subtitle</item> <item name="android:windowBackground">?windowBackgroundForced</item> <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@color/bg_statusbar</item> - <item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="lollipop">true</item> <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item> <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowActionBarOverlay">true</item> <item name="clickableBackground">?selectableItemBackground</item> + <item name="windowActionBar">false</item> + <item name="windowActionBarOverlay">true</item> <item name="alertDialogTheme">@style/MwmTheme.DialogFragment</item> <item name="windowBackgroundForced">@color/bg_window</item> @@ -22,7 +24,6 @@ <item name="cardBackground">@color/bg_cards</item> <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item> - <item name="statusBar">@color/bg_statusbar</item> <item name="colorPrimary">@color/bg_primary</item> <item name="colorControlNormal">?secondary</item> <item name="colorAccent">@color/base_accent</item> @@ -95,11 +96,13 @@ <item name="android:textColorSecondary">@color/text_light_subtitle</item> <item name="android:windowBackground">?windowBackgroundForced</item> <item name="android:colorPrimaryDark" tools:targetApi="lollipop">?statusBar</item> - <item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="lollipop">true</item> <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item> <item name="android:colorBackgroundCacheHint">@null</item> + <item name="android:windowActionBarOverlay">true</item> <item name="clickableBackground">?selectableItemBackground</item> + <item name="windowActionBar">false</item> + <item name="windowActionBarOverlay">true</item> <item name="alertDialogTheme">@style/MwmTheme.Night.DialogFragment</item> <item name="windowBackgroundForced">@color/bg_window_night</item> @@ -107,7 +110,6 @@ <item name="cardBackground">@color/bg_cards_night</item> <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item> - <item name="statusBar">@color/bg_statusbar_night</item> <item name="colorPrimary">@color/bg_primary_night</item> <item name="colorControlNormal">?secondary</item> <item name="colorAccent">@color/base_accent_night</item> diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml index 39cfcd2313..7c56bf91ed 100644 --- a/android/res/values/themes.xml +++ b/android/res/values/themes.xml @@ -78,6 +78,7 @@ <item name="android:textViewStyle">@style/MwmWidget.TextView</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item> + <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item> </style> <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat"> @@ -91,6 +92,7 @@ <item name="android:textViewStyle">@style/MwmWidget.TextView</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item> + <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item> </style> <style name="MwmTheme.DialogFragment.Fullscreen.Translucent"> @@ -169,9 +171,6 @@ <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item> <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item> <item name="android:windowBackground">@null</item> - <item name="windowActionBar">false</item> - <item name="windowActionBarOverlay">true</item> - <item name="android:windowActionBarOverlay">true</item> </style> <style name="MwmTheme.Night.FullScreenGalleryActivity"> @@ -179,9 +178,6 @@ <item name="android:colorPrimaryDark" tools:targetApi="lollipop">@android:color/black</item> <item name="android:timePickerStyle" tools:targetApi="lollipop">@style/MwmWidget.Editor.TimePicker</item> <item name="android:windowBackground">@null</item> - <item name="windowActionBar">false</item> - <item name="windowActionBarOverlay">true</item> - <item name="android:windowActionBarOverlay">true</item> </style> </resources> |