PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Set GLIF v1 background color to true white/black"

Browse source
This commit is contained in:
TreeHugger Robot 2017-05-02 20:03:39 +00:00 committed by Android (Google) Code Review
parent 8dcd1ef45d c57872c260
commit c8acb8d453
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/gingerbread/res/values/styles.xml
View file

@ -80,6 +80,7 @@
</style>
<style name="SuwThemeGlif" parent="Theme.AppCompat.NoActionBar">
<item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>
@ -113,6 +114,7 @@
</style>
<style name="SuwThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:colorBackground">@color/suw_glif_background_color_light</item>
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
<item name="android:indeterminateTintMode" tools:ignore="NewApi">src_in</item>

4
library/main/res/values/colors.xml
View file

@ -40,7 +40,7 @@
<!-- GLIF colors -->
<color name="suw_color_accent_glif_dark">#ff4285f4</color>
<color name="suw_color_accent_glif_light">#ff4285f4</color>
<color name="suw_glif_v2_background_color_dark">#ff000000</color>
<color name="suw_glif_v2_background_color_light">#ffffffff</color>
<color name="suw_glif_background_color_dark">#ff000000</color>
<color name="suw_glif_background_color_light">#ffffffff</color>
</resources>

4
library/main/res/values/styles.xml
View file

@ -20,7 +20,7 @@
<!-- General styles -->
<style name="SuwThemeGlifV2" parent="SuwThemeGlif">
<item name="android:colorBackground">@color/suw_glif_v2_background_color_dark</item>
<item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="suwBackgroundBaseColor">?android:attr/colorBackground</item>
@ -36,7 +36,7 @@
<style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" />
<style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light">
<item name="android:colorBackground">@color/suw_glif_v2_background_color_light</item>
<item name="android:colorBackground">@color/suw_glif_background_color_light</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="suwBackgroundBaseColor">?android:attr/colorBackground</item>

2
library/platform/res/values-v23/styles.xml
View file

@ -81,6 +81,7 @@
<!-- Placeholder for GLIF dark theme, colors are not updated yet -->
<style name="SuwThemeGlif" parent="android:Theme.Material.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_glif_dark</item>
<item name="android:colorBackground">@color/suw_glif_background_color_dark</item>
<item name="android:colorPrimary">@color/suw_color_accent_glif_dark</item>
<item name="android:indeterminateTint">?android:attr/colorPrimary</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
@ -111,6 +112,7 @@
<style name="SuwThemeGlif.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:colorAccent">@color/suw_color_accent_glif_light</item>
<item name="android:colorBackground">@color/suw_glif_background_color_light</item>
<item name="android:colorPrimary">@color/suw_color_accent_glif_light</item>
<item name="android:indeterminateTint">?android:attr/colorPrimary</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->

2
library/test/instrumentation/src/com/android/setupwizardlib/test/GlifLayoutTest.java
View file

@ -115,7 +115,7 @@ public class GlifLayoutTest {
}
assertEquals("Status bar color should be white in GLIF v2 theme",
"fffafafa",
"ffffffff",
Integer.toHexString(glifLayout.getBackgroundBaseColor().getDefaultColor()));
assertFalse("GLIF v2 theme shuold not have patterned background",
glifLayout.isBackgroundPatterned());