Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630
Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
<style name="GlifTheme" parent="SuwThemeGlif">
|
||||
<!-- For all Alert Dialogs -->
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
||||
<item name="android:colorPrimary">@color/suw_color_accent_dark</item>
|
||||
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
||||
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
||||
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
||||
@@ -46,7 +45,6 @@
|
||||
<style name="GlifTheme.Light" parent="SuwThemeGlif.Light">
|
||||
<!-- For all Alert Dialogs -->
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
||||
<item name="android:colorPrimary">@color/suw_color_accent_light</item>
|
||||
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
||||
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
||||
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
||||
@@ -66,7 +64,6 @@
|
||||
<style name="GlifV2Theme" parent="SuwThemeGlifV2">
|
||||
<!-- For all Alert Dialogs -->
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
||||
<item name="android:colorPrimary">@color/suw_color_accent_dark</item>
|
||||
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
||||
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
||||
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
||||
@@ -87,7 +84,6 @@
|
||||
<style name="GlifV2Theme.Light" parent="SuwThemeGlifV2.Light">
|
||||
<!-- For all Alert Dialogs -->
|
||||
<item name="android:alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
|
||||
<item name="android:colorPrimary">@color/suw_color_accent_light</item>
|
||||
<item name="android:windowBackground">?android:attr/colorBackground</item>
|
||||
<item name="*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
|
||||
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
||||
|
Reference in New Issue
Block a user