release-request-7f84484c-eec6-4577-8d5a-55079be4f3c5-for-git_oc-mr1-release-4262309 snap-temp-L02100000091441105

Change-Id: I1ef03cf8f01232098bf1807eee5753c4e2d32961

2 files changed, 23 insertions, 2 deletions

diff --git a/library/platform/res/values-v23/styles.xml b/library/platform/res/values-v23/styles.xml
index 2eb5caf..9fff5f1 100644
--- a/library/platform/res/values-v23/styles.xml
+++ b/library/platform/res/values-v23/styles.xml
@@ -92,7 +92,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_dark</item>
@@ -124,7 +124,7 @@
         <item name="android:listPreferredItemPaddingEnd">?attr/suwMarginSides</item>
         <item name="android:listPreferredItemPaddingStart">?attr/suwMarginSides</item>
         <item name="android:navigationBarColor">@android:color/black</item>
-        <item name="android:statusBarColor">?android:attr/colorPrimary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textAppearanceListItem">@style/TextAppearance.SuwGlifItemTitle</item>
         <item name="android:textAppearanceListItemSmall">@style/TextAppearance.SuwGlifItemSummary</item>
         <item name="android:textColorLink">@color/suw_color_accent_glif_light</item>
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
index e4e311f..aea2c03 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifStyleTest.java
@@ -20,9 +20,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.robolectric.RuntimeEnvironment.application;
 
+import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.view.ContextThemeWrapper;
 import android.widget.Button;
 
@@ -63,4 +67,21 @@ public class GlifStyleTest {
             assertEquals("ff4285f4", Integer.toHexString(button.getTextColors().getDefaultColor()));
         }
     }
+
+    @TargetApi(VERSION_CODES.LOLLIPOP)
+    @Config(sdk = Config.NEWEST_SDK)
+    @Test
+    public void glifThemeLight_statusBarColorShouldBeTransparent() {
+        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+        assertEquals(0x00000000, activity.getWindow().getStatusBarColor());
+    }
+
+    private static class GlifThemeActivity extends Activity {
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            setTheme(R.style.SuwThemeGlif_Light);
+            super.onCreate(savedInstanceState);
+        }
+    }
 }