diff options
author | Maurice Lam <yukl@google.com> | 2017-12-15 17:03:23 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-12-16 01:29:20 +0000 |
commit | e22d7c2b358d9c0f362627d3194b051719f2ba5c (patch) | |
tree | 5286813916ab2113c0a8ba85e610a6dff6b2eb1e | |
parent | 6cd5a7230264c8b0fc2969ff70192eb7b165c689 (diff) | |
download | setupwizard-e22d7c2b358d9c0f362627d3194b051719f2ba5c.tar.gz |
Change accent color in GLIF V3
Change the accent color to Google Blue 600 for better contrast. The
button color change in ag/3301076 was mostly reverted because the
color will be automatically picked up from the updated accent color.
Test: Manual, Existing tests pass
Bug: 69930196
Change-Id: I2fad5b029357afec9402ef8de5810fa0e092a713
-rw-r--r-- | library/gingerbread/res/values/styles.xml | 17 | ||||
-rw-r--r-- | library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java | 57 | ||||
-rw-r--r-- | library/main/res/color-v23/suw_flat_button_highlight.xml | 2 | ||||
-rw-r--r-- | library/main/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | library/main/res/values/colors.xml | 4 | ||||
-rw-r--r-- | library/main/res/values/styles.xml | 12 | ||||
-rw-r--r-- | library/platform/res/values-v23/styles.xml | 12 |
7 files changed, 60 insertions, 45 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 1653938..6cdbe3c 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -39,7 +39,6 @@ <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg_dark</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -72,7 +71,6 @@ <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg_light</item> <item name="suwDividerInsetEnd">0dp</item> <item name="suwDividerInsetStart">@dimen/suw_items_icon_divider_inset</item> @@ -105,7 +103,6 @@ <item name="colorPrimary">@color/suw_color_accent_glif_dark</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -141,7 +138,6 @@ <item name="colorPrimary">@color/suw_color_accent_glif_light</item> <item name="listPreferredItemPaddingLeft">?attr/suwMarginSides</item> <item name="listPreferredItemPaddingRight">?attr/suwMarginSides</item> - <item name="suwButtonColor">?attr/colorAccent</item> <item name="suwColorPrimary">?attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -157,6 +153,14 @@ <item name="textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item> </style> + <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> + <item name="colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + + <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> + <item name="colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + <!-- Content styles --> <style name="TextAppearance.SuwDescription" parent="TextAppearance.AppCompat.Medium"> @@ -209,10 +213,6 @@ <!-- Values used in styles --> <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> - - <!-- Values used in themes --> - <item name="android:backgroundTint" tools:targetApi="lollipop">?attr/suwButtonColor</item> - <item name="backgroundTint">?attr/suwButtonColor</item> </style> <style name="SuwGlifButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored"> @@ -227,7 +227,6 @@ <item name="android:minWidth">0dp</item> <item name="android:paddingLeft">@dimen/suw_glif_button_padding</item> <item name="android:paddingRight">@dimen/suw_glif_button_padding</item> - <item name="android:textColor">?attr/suwButtonColor</item> <!-- Values used in themes --> <item name="android:colorControlHighlight" tools:targetApi="lollipop">@color/suw_flat_button_highlight</item> diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java index 74d3be6..b97905c 100644 --- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java +++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java @@ -18,6 +18,7 @@ package com.android.setupwizardlib.items; import static org.junit.Assert.assertTrue; +import android.support.annotation.StyleRes; import android.support.test.annotation.UiThreadTest; import android.support.test.filters.SmallTest; import android.support.test.rule.UiThreadTestRule; @@ -29,7 +30,6 @@ import android.widget.LinearLayout; import com.android.setupwizardlib.R; import com.android.setupwizardlib.test.util.DrawingTestHelper; -import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,40 +38,61 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public class ButtonItemDrawingTest { - private static final int GOOGLE_BLUE = 0xff4285f4; + private static final int GLIF_ACCENT_COLOR = 0xff4285f4; + private static final int GLIF_V3_ACCENT_COLOR = 0xff1a73e8; // These tests need to be run on UI thread because button uses ValueAnimator @Rule public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule(); - private ViewGroup mParent; + @Test + @UiThreadTest + public void drawButton_glif_shouldHaveAccentColoredButton() + throws InstantiationException, IllegalAccessException { + Button button = createButton(R.style.SuwThemeGlif_Light); + + DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50); + drawingTestHelper.drawView(button); - @Before - public void setUp() throws Exception { - mParent = new LinearLayout( - DrawingTestHelper.createCanvasActivity(R.style.SuwThemeGlif_Light)); + int accentPixelCount = + countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_ACCENT_COLOR); + assertTrue("> 10 pixels should be #4285f4. Found " + accentPixelCount, + accentPixelCount > 10); } @Test @UiThreadTest - public void testColoredButtonTheme() { + public void drawButton_glifV3_shouldHaveAccentColoredButton() + throws InstantiationException, IllegalAccessException { + Button button = createButton(R.style.SuwThemeGlifV3_Light); + + DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50); + drawingTestHelper.drawView(button); + + int accentPixelCount = + countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_V3_ACCENT_COLOR); + assertTrue("> 10 pixels should be #1a73e8. Found " + accentPixelCount, + accentPixelCount > 10); + } + + private Button createButton(@StyleRes int theme) + throws InstantiationException, IllegalAccessException { + final ViewGroup parent = new LinearLayout(DrawingTestHelper.createCanvasActivity(theme)); TestButtonItem item = new TestButtonItem(); item.setTheme(R.style.SuwButtonItem_Colored); item.setText("foobar"); - final Button button = item.createButton(mParent); - - DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50); - drawingTestHelper.drawView(button); + return item.createButton(parent); + } - int googleBluePixelCount = 0; - for (int pixel : drawingTestHelper.getPixels()) { - if (pixel == GOOGLE_BLUE) { - googleBluePixelCount++; + private int countPixelsWithColor(int[] pixels, int color) { + int count = 0; + for (int pixel : pixels) { + if (pixel == color) { + count++; } } - assertTrue("> 10 pixels should be Google blue. Found " + googleBluePixelCount, - googleBluePixelCount > 10); + return count; } private static class TestButtonItem extends ButtonItem { diff --git a/library/main/res/color-v23/suw_flat_button_highlight.xml b/library/main/res/color-v23/suw_flat_button_highlight.xml index 4d90570..c5be14f 100644 --- a/library/main/res/color-v23/suw_flat_button_highlight.xml +++ b/library/main/res/color-v23/suw_flat_button_highlight.xml @@ -16,6 +16,6 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="?attr/suwButtonColor" + <item android:color="?android:attr/colorAccent" android:alpha="0.24" /> </selector> diff --git a/library/main/res/values/attrs.xml b/library/main/res/values/attrs.xml index 7820a6d..ffdf365 100644 --- a/library/main/res/values/attrs.xml +++ b/library/main/res/values/attrs.xml @@ -20,7 +20,6 @@ <!-- Theme attributes --> <attr name="suwLayoutTheme" format="reference" /> <attr name="suwMarginSides" format="dimension|reference" /> - <attr name="suwButtonColor" format="color" /> <attr name="suwEditTextBackgroundColor" format="color" /> <!-- Subset of values in "gravity" in frameworks/base/core/res/res/values/attrs.xml. Only diff --git a/library/main/res/values/colors.xml b/library/main/res/values/colors.xml index b653c98..e919f4b 100644 --- a/library/main/res/values/colors.xml +++ b/library/main/res/values/colors.xml @@ -42,9 +42,9 @@ <!-- GLIF colors --> <color name="suw_color_accent_glif_dark">#ff4285f4</color> <color name="suw_color_accent_glif_light">#ff4285f4</color> + <color name="suw_color_accent_glif_v3">#ff1a73e8</color> <color name="suw_glif_background_color_dark">#ff000000</color> <color name="suw_glif_background_color_light">#ffffffff</color> - <color name="suw_glif_v3_footer_button_color">#ff1a73e8</color> - <color name="suw_glif_edittext_bg_light_color">#F1F3F4</color> + <color name="suw_glif_edit_text_bg_light_color">#fff1f3f4</color> </resources> diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 1d7d28b..022efe4 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -30,7 +30,7 @@ <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> <item name="suwGlifHeaderGravity">center_horizontal</item> <item name="suwScrollIndicators">top|bottom</item> - <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> <!-- TODO: Change color --> + <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <!-- TODO: Change color --> <item name="android:editTextStyle">@style/SuwEditText</item> </style> @@ -45,18 +45,10 @@ <item name="suwDividerInsetStartNoIcon">?attr/suwMarginSides</item> <item name="suwGlifHeaderGravity">center_horizontal</item> <item name="suwScrollIndicators">top|bottom</item> - <item name="suwEditTextBackgroundColor">@color/suw_glif_edittext_bg_light_color</item> + <item name="suwEditTextBackgroundColor">@color/suw_glif_edit_text_bg_light_color</item> <item name="android:editTextStyle">@style/SuwEditText</item> </style> - <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> - <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item> - </style> - - <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> - <item name="suwButtonColor">@color/suw_glif_v3_footer_button_color</item> - </style> - <style name="Animation.SuwWindowAnimation" parent="@android:style/Animation.Activity"> <item name="android:activityOpenEnterAnimation">@anim/suw_slide_next_in</item> <item name="android:activityOpenExitAnimation">@anim/suw_slide_next_out</item> diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml index 26ab230..61a75fb 100644 --- a/library/platform/res/values-v23/styles.xml +++ b/library/platform/res/values-v23/styles.xml @@ -41,7 +41,6 @@ <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="suwButtonColor">?android:attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -71,7 +70,6 @@ <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="suwButtonColor">?android:attr/colorAccent</item> <item name="suwCardBackground">@drawable/suw_card_bg</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -104,7 +102,6 @@ <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="suwButtonColor">?android:attr/colorAccent</item> <item name="suwColorPrimary">?android:attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -137,7 +134,6 @@ <item name="android:windowDisablePreview">true</item> <item name="android:windowSoftInputMode">adjustResize</item> - <item name="suwButtonColor">?android:attr/colorAccent</item> <item name="suwColorPrimary">?android:attr/colorPrimary</item> <item name="suwFillContentLayoutStyle">@style/SuwFillContentLayout</item> <item name="suwDividerInsetEnd">0dp</item> @@ -151,6 +147,14 @@ <item name="suwScrollIndicators">bottom</item> </style> + <style name="SuwThemeGlifV3" parent="SuwThemeGlifV2"> + <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + + <style name="SuwThemeGlifV3.Light" parent="SuwThemeGlifV2.Light"> + <item name="android:colorAccent">@color/suw_color_accent_glif_v3</item> + </style> + <!-- Button styles --> <style name="SuwGlifButton.Primary" parent="android:Widget.Material.Button.Colored"> |