resolve merge conflicts of 078d4de90b to ub-launcher3-calgary

Change-Id: Iec05a686848a03fa76a893d33fa4c465f00e8a71
2016-02-25 09:21:44 -08:00
parent 7515f1b41c 078d4de90b
commit c90e21f286
1 changed files with 3 additions and 0 deletions
@@ -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>