Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cff03505 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Use DayNight theme in factory reset page"

parents b402a56f 24935872

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ 
            android:enabled="false"

            android:exported="true"

            android:taskAffinity="com.android.wizard"

            android:theme="@style/SuwThemeGlif.Light"

            android:theme="@style/SuwThemeGlif.DayNight"

            android:label="@string/lock_screen_notifications_interstitial_title"

            android:icon="@drawable/ic_suggested_notifications">

            <intent-filter>

res/layout/master_clear.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:theme="@style/SuwThemeGlifV3.Light"

    android:theme="@style/SuwThemeGlifV3.DayNight"

    android:icon="@drawable/ic_delete_accent"

    app:suwHeaderText="@string/master_clear_title">

res/layout/master_clear_confirm.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:theme="@style/SuwThemeGlifV3.Light"

    android:theme="@style/SuwThemeGlifV3.DayNight"

    android:id="@+id/setup_wizard_layout"

    android:icon="@drawable/ic_delete_accent"

    app:suwHeaderText="@string/master_clear_confirm_title">

res/values/themes_suw.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<!-- SUW related themes -->

<resources>

    <style name="GlifTheme" parent="SuwThemeGlif">

    <style name="GlifTheme" parent="SuwThemeGlif.DayNight">

        <!-- For all AndroidX Alert Dialogs -->

        <item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -55,7 +55,7 @@ 
        <item name="*android:colorError">@color/glif_error_color</item>

    </style>



    <style name="GlifV2Theme" parent="SuwThemeGlifV2">

    <style name="GlifV2Theme" parent="SuwThemeGlifV2.DayNight">

        <!-- For all AndroidX Alert Dialogs -->

        <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -93,7 +93,7 @@ 
        <item name="*android:colorError">@color/glif_error_color</item>

    </style>



    <style name="GlifV3Theme" parent="SuwThemeGlifV3">

    <style name="GlifV3Theme" parent="SuwThemeGlifV3.DayNight">

        <!-- For all AndroidX Alert Dialogs -->

        <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>

        <item name="android:windowBackground">?android:attr/colorBackground</item>