PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use DayNight theme in factory reset page"

Browse Source
This commit is contained in:
Fan Zhang
2018-10-16 18:08:56 +00:00
committed by Android (Google) Code Review
parent b402a56fec 2493587202
commit cff03505bb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -1560,7 +1560,7 @@
android:enabled="false" android:enabled="false"
android:exported="true" android:exported="true"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SuwThemeGlif.Light" android:theme="@style/SuwThemeGlif.DayNight"
android:label="@string/lock_screen_notifications_interstitial_title" android:label="@string/lock_screen_notifications_interstitial_title"
android:icon="@drawable/ic_suggested_notifications"> android:icon="@drawable/ic_suggested_notifications">
<intent-filter> <intent-filter>

2
res/layout/master_clear.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:theme="@style/SuwThemeGlifV3.Light" android:theme="@style/SuwThemeGlifV3.DayNight"
android:icon="@drawable/ic_delete_accent" android:icon="@drawable/ic_delete_accent"
app:suwHeaderText="@string/master_clear_title"> app:suwHeaderText="@string/master_clear_title">

2
res/layout/master_clear_confirm.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:theme="@style/SuwThemeGlifV3.Light" android:theme="@style/SuwThemeGlifV3.DayNight"
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:icon="@drawable/ic_delete_accent" android:icon="@drawable/ic_delete_accent"
app:suwHeaderText="@string/master_clear_confirm_title"> app:suwHeaderText="@string/master_clear_confirm_title">

6
res/values/themes_suw.xml
View File

@@ -17,7 +17,7 @@
<!-- SUW related themes --> <!-- SUW related themes -->
<resources> <resources>
<style name="GlifTheme" parent="SuwThemeGlif"> <style name="GlifTheme" parent="SuwThemeGlif.DayNight">
<!-- For all AndroidX Alert Dialogs --> <!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item> <item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -55,7 +55,7 @@
<item name="*android:colorError">@color/glif_error_color</item> <item name="*android:colorError">@color/glif_error_color</item>
</style> </style>
<style name="GlifV2Theme" parent="SuwThemeGlifV2"> <style name="GlifV2Theme" parent="SuwThemeGlifV2.DayNight">
<!-- For all AndroidX Alert Dialogs --> <!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item> <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -93,7 +93,7 @@
<item name="*android:colorError">@color/glif_error_color</item> <item name="*android:colorError">@color/glif_error_color</item>
</style> </style>
<style name="GlifV3Theme" parent="SuwThemeGlifV3"> <style name="GlifV3Theme" parent="SuwThemeGlifV3.DayNight">
<!-- For all AndroidX Alert Dialogs --> <!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item> <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item> <item name="android:windowBackground">?android:attr/colorBackground</item>