diff options
| author | Maurice Lam <yukl@google.com> | 2017-04-05 18:54:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-05 18:54:44 +0000 |
| commit | c416fc6377cf4241db6fc950c17981ddd37d2484 (patch) | |
| tree | b88622a58b07d2c2d165869b84fad35c946f5f6e /library/main/res | |
| parent | cdb56e724e7d1f47101ea448cdea3886ec71efc7 (diff) | |
| parent | e46be9bcf0dd195989b10768ceb57dd2c70095a9 (diff) | |
| download | setupwizard-c416fc6377cf4241db6fc950c17981ddd37d2484.tar.gz | |
Merge "Rename GLIF Pixel to GLIF v2"
Diffstat (limited to 'library/main/res')
| -rw-r--r-- | library/main/res/values/styles.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/library/main/res/values/styles.xml b/library/main/res/values/styles.xml index 2b145bb..6a9b9a8 100644 --- a/library/main/res/values/styles.xml +++ b/library/main/res/values/styles.xml @@ -19,7 +19,7 @@ <!-- General styles --> - <style name="SuwThemeGlifPixel" parent="SuwThemeGlif"> + <style name="SuwThemeGlifV2" parent="SuwThemeGlif"> <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> @@ -28,7 +28,10 @@ <item name="suwScrollIndicators">top|bottom</item> </style> - <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlif.Light"> + <!-- Deprecated. Use SuwThemeGlifV2 instead --> + <style name="SuwThemeGlifPixel" parent="SuwThemeGlifV2" /> + + <style name="SuwThemeGlifV2.Light" parent="SuwThemeGlif.Light"> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item> <item name="suwBackgroundBaseColor">?android:attr/colorBackground</item> @@ -37,6 +40,9 @@ <item name="suwScrollIndicators">top|bottom</item> </style> + <!-- Deprecated. Use SuwThemeGlifV2.Light instead --> + <style name="SuwThemeGlifPixel.Light" parent="SuwThemeGlifV2.Light" /> + <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> |