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

Commit 55e4e5d0 authored by Hank Sheng's avatar Hank Sheng Committed by Automerger Merge Worker
Browse files

Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is... 

Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708 am: 349b36bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898



Change-Id: Ifcef39885b565fbbdc950fe43c6b26d57e2bdcfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6737a44f 349b36bb

res/values-night/themes_suw.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    <style name="GlifTheme.DayNight" parent="GlifTheme" />

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

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

    <style name="GlifV4Theme.DayNight" parent="GlifV4Theme" />

    <style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.NoActionBar" />

    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />

    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />

res/values/themes_suw.xml

+38 −0
Original line number Diff line number Diff line
@@ -133,6 +133,43 @@ 
        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

    </style>



    <style name="GlifV4Theme" parent="SudThemeGlifV4.DayNight">

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

        <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</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>

        <item name="face_layout_theme">@style/FaceLayoutTheme</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>

        <item name="side_margin">0dip</item>

        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>

        <item name="wifi_signal">@drawable/wifi_signal</item>

        <item name="wifi_friction">@drawable/wifi_friction</item>

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

        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>



        <!-- LockPatternView colors -->

        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

    </style>



    <style name="GlifV4Theme.Light" parent="SudThemeGlifV4.Light">

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

        <item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog.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>

        <item name="face_layout_theme">@style/FaceLayoutTheme</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>

        <item name="side_margin">0dip</item>

        <item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>

        <item name="wifi_signal">@drawable/wifi_signal</item>

        <item name="wifi_friction">@drawable/wifi_friction</item>

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

        <item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>



        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

    </style>



    <style name="GlifV3Theme.Light.NoActionBar" parent="GlifV3Theme.Light">

        <item name="android:windowActionBar">false</item>

    </style>
@@ -238,6 +275,7 @@ 
    <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />

    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />

    <style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />

    <style name="GlifV4Theme.DayNight" parent="GlifV4Theme.Light" />

    <style name="GlifV3Theme.DayNight.NoActionBar" parent="GlifV3Theme.Light.NoActionBar" />

    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />

    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />

src/com/android/settings/SetupWizardUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ public class SetupWizardUtils { 
            if (WizardManagerHelper.isAnySetupWizard(intent)) {

                if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {

                    switch (theme) {

                        // TODO(b/233032365): Create glif v4 theme for this case.

                        case ThemeHelper.THEME_GLIF_V4_LIGHT:

                        case ThemeHelper.THEME_GLIF_V4:

                            return R.style.GlifV4Theme_DayNight;

                        case ThemeHelper.THEME_GLIF_V3_LIGHT:

                        case ThemeHelper.THEME_GLIF_V3:

                            return R.style.GlifV3Theme_DayNight;
@@ -63,11 +63,12 @@ public class SetupWizardUtils { 
                    }

                } else {

                    switch (theme) {

                        // TODO(b/233032365): Create glif v4 theme for this case.

                        case ThemeHelper.THEME_GLIF_V4_LIGHT:

                            return R.style.GlifV4Theme_Light;

                        case ThemeHelper.THEME_GLIF_V4:

                            return R.style.GlifV4Theme;

                        case ThemeHelper.THEME_GLIF_V3_LIGHT:

                            return R.style.GlifV3Theme_Light;

                        case ThemeHelper.THEME_GLIF_V4:

                        case ThemeHelper.THEME_GLIF_V3:

                            return R.style.GlifV3Theme;

                        case ThemeHelper.THEME_GLIF_V2_LIGHT:
@@ -82,9 +83,9 @@ public class SetupWizardUtils { 
                }

            } else {

                switch (theme) {

                    // TODO(b/233032365): Create glif v4 theme for this case.

                    case ThemeHelper.THEME_GLIF_V4_LIGHT:

                    case ThemeHelper.THEME_GLIF_V4:

                        return R.style.GlifV4Theme;

                    case ThemeHelper.THEME_GLIF_V3_LIGHT:

                    case ThemeHelper.THEME_GLIF_V3:

                        return R.style.GlifV3Theme;