Use light navigation bar in light SC themes

New app layout currently enforces this, so unbreak it there

Change-Id: I8885c18d839d715b4308a4abd9634a1130da13e2

generate_themes.sh

@@ -61,7 +61,7 @@ function generate_accent_common() {
     local name="$1"
     local name_str="$2"
     local name_lc=`echo "$name" | tr '[:upper:]' '[:lower:]'`
-    insert_above_xml_comment "vector/src/main/res/values/strings_sc.xml" "do not change this comment for accent generation" "<string name=\"sc_accent_$name_lc\">$name_str</string>" "    "
+    insert_above_xml_comment "library/ui-strings/src/main/res/values/strings_sc.xml" "do not change this comment for accent generation" "<string name=\"sc_accent_$name_lc\">$name_str</string>" "    "
 }
 
 function generate_accent_light() {

library/ui-styles/src/main/res/values-v23/theme_sc.xml

@@ -17,11 +17,6 @@
         <item name="android:windowLightStatusBar">false</item>
     </style>
 
-    <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
-        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
-        <item name="android:windowLightStatusBar">true</item>
-    </style>
-
     <style name="AppTheme.SC" parent="AppTheme.SC.v23"/>
 
     <style name="AppTheme.SC.Dark" parent="AppTheme.SC.Dark.v23"/>
@@ -30,6 +25,4 @@
 
     <style name="AppTheme.SC.Dark.Colored" parent="AppTheme.SC.Dark.Colored.v23"/>
 
-    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v23"/>
-
 </resources>

library/ui-styles/src/main/res/values-v23/theme_sc_light.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
+        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v23"/>
+
+</resources>

library/ui-styles/src/main/res/values-v27/theme_sc.xml

@@ -17,10 +17,6 @@
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 
-    <style name="AppTheme.SC.Light.v27" parent="AppTheme.SC.Light.v23">
-        <item name="android:windowLightNavigationBar">false</item>
-    </style>
-
     <style name="AppTheme.SC" parent="AppTheme.SC.v27" />
 
     <style name="AppTheme.SC.Dark" parent="AppTheme.SC.Dark.v27" />
@@ -29,6 +25,4 @@
 
     <style name="AppTheme.SC.Dark.Colored" parent="AppTheme.SC.Dark.Colored.v27" />
 
-    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v27" />
-
 </resources>

library/ui-styles/src/main/res/values-v27/theme_sc_light.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.v27" parent="AppTheme.SC.Light.v23">
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light" parent="AppTheme.SC.Light.v27" />
+
+</resources>

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_amber.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Amber.v27" parent="AppTheme.SC.Light.Amber.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Amber" parent="AppTheme.SC.Light.Amber.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Blue.v27" parent="AppTheme.SC.Light.Blue.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Blue" parent="AppTheme.SC.Light.Blue.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_bluelight.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.BlueLight.v27" parent="AppTheme.SC.Light.BlueLight.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.BlueLight" parent="AppTheme.SC.Light.BlueLight.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_carnation.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Carnation.v27" parent="AppTheme.SC.Light.Carnation.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Carnation" parent="AppTheme.SC.Light.Carnation.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_cyan.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Cyan.v27" parent="AppTheme.SC.Light.Cyan.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Cyan" parent="AppTheme.SC.Light.Cyan.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_denim.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Denim.v27" parent="AppTheme.SC.Light.Denim.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Denim" parent="AppTheme.SC.Light.Denim.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_gold.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Gold.v27" parent="AppTheme.SC.Light.Gold.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Gold" parent="AppTheme.SC.Light.Gold.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.GreenDark.v27" parent="AppTheme.SC.Light.GreenDark.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.GreenDark" parent="AppTheme.SC.Light.GreenDark.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_indigo.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Indigo.v27" parent="AppTheme.SC.Light.Indigo.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Indigo" parent="AppTheme.SC.Light.Indigo.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lava.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Lava.v27" parent="AppTheme.SC.Light.Lava.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Lava" parent="AppTheme.SC.Light.Lava.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_lime.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Lime.v27" parent="AppTheme.SC.Light.Lime.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Lime" parent="AppTheme.SC.Light.Lime.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_orange.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Orange.v27" parent="AppTheme.SC.Light.Orange.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Orange" parent="AppTheme.SC.Light.Orange.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_pink.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Pink.v27" parent="AppTheme.SC.Light.Pink.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Pink" parent="AppTheme.SC.Light.Pink.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_purple.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Purple.v27" parent="AppTheme.SC.Light.Purple.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Purple" parent="AppTheme.SC.Light.Purple.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_red.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Red.v27" parent="AppTheme.SC.Light.Red.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Red" parent="AppTheme.SC.Light.Red.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_teal.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Teal.v27" parent="AppTheme.SC.Light.Teal.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Teal" parent="AppTheme.SC.Light.Teal.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_turquoise.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Turquoise.v27" parent="AppTheme.SC.Light.Turquoise.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Turquoise" parent="AppTheme.SC.Light.Turquoise.v27" />

library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_yellow.xml

@@ -2,7 +2,8 @@
 <resources>
 
     <style name="AppTheme.SC.Light.Yellow.v27" parent="AppTheme.SC.Light.Yellow.v23">
-        <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:navigationBarColor">@color/background_sc_light_toolbar</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="AppTheme.SC.Light.Yellow" parent="AppTheme.SC.Light.Yellow.v27" />