resolve merge conflicts of 078d4de90b to ub-launcher3-calgary
am: c90e21f286
* commit 'c90e21f28683a9256bfda7824bd4cf263a082f58':
Defining the base state of the Launcher theme, in case the platform has different defaults
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index bc8523e..aa5d0a6 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>