diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-25 09:21:44 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-25 09:21:44 -0800 |
commit | c90e21f28683a9256bfda7824bd4cf263a082f58 (patch) | |
tree | 652abc5e38c01c86ac3c4dc938c3b1fe36ade073 /res/values-v21 | |
parent | 7515f1b41c8a857b076490b170cd074086da4cd3 (diff) | |
parent | 078d4de90b2a759e2fe465763f8a95bbf13592bb (diff) | |
download | android_packages_apps_Trebuchet-c90e21f28683a9256bfda7824bd4cf263a082f58.tar.gz android_packages_apps_Trebuchet-c90e21f28683a9256bfda7824bd4cf263a082f58.tar.bz2 android_packages_apps_Trebuchet-c90e21f28683a9256bfda7824bd4cf263a082f58.zip |
resolve merge conflicts of 078d4de90b to ub-launcher3-calgary
Change-Id: Iec05a686848a03fa76a893d33fa4c465f00e8a71
Diffstat (limited to 'res/values-v21')
-rw-r--r-- | res/values-v21/styles.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml index bc8523ecc..aa5d0a6d8 100644 --- a/res/values-v21/styles.xml +++ b/res/values-v21/styles.xml @@ -19,6 +19,9 @@ <resources> <style name="LauncherTheme" parent="@style/BaseLauncherTheme"> + <item name="android:windowTranslucentStatus">false</item> + <item name="android:windowTranslucentNavigation">false</item> + <item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:statusBarColor">#00000000</item> <item name="android:navigationBarColor">#00000000</item> <item name="android:colorControlActivated">@color/launcher_accent_color</item> |