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

Commit ee19a81e authored by Menghan Li's avatar Menghan Li Committed by Automerger Merge Worker
Browse files

Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev am: 10314062 

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



Change-Id: Ibf92aace6506e1fa43480198a56a15ed4eeca57b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d5416be 10314062

res/values/themes_suw.xml

+10 −0
Original line number Diff line number Diff line
@@ -244,6 +244,16 @@ 
        <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>

    </style>



    <!-- This theme was applied to Settings pages which are running under SUW. -->

    <style name="SettingsPreferenceTheme.SetupWizard" parent="@style/PreferenceTheme.SettingsLib">

        <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

        <item name="android:listPreferredItemPaddingStart">@dimen/settingslib_listPreferredItemPaddingStart</item>

        <item name="android:listPreferredItemPaddingEnd">16dp</item>

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

        <item name="android:switchStyle">@style/Switch.SettingsLib</item>

        <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>

    </style>



    <!-- DayNight themes -->

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

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

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

+2 −6
Original line number Diff line number Diff line
@@ -102,11 +102,7 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit 


    private void applyTheme() {

        setTheme(SetupWizardUtils.getTheme(this, getIntent()));

        if (ThemeHelper.trySetDynamicColor(this)) {

            final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)

                    ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight

                    : R.style.SudDynamicColorThemeSettings_SetupWizard;

            setTheme(appliedTheme);

        }

        setTheme(R.style.SettingsPreferenceTheme_SetupWizard);

        ThemeHelper.trySetDynamicColor(this);

    }

}

src/com/android/settings/core/SettingsBaseActivity.java

+2 −6
Original line number Diff line number Diff line
@@ -96,12 +96,8 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa 
        final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());

        if (isAnySetupWizard && this instanceof SubSettings) {

            setTheme(SetupWizardUtils.getTheme(this, getIntent()));

            if (ThemeHelper.trySetDynamicColor(this)) {

                final int appliedTheme = ThemeHelper.isSetupWizardDayNightEnabled(this)

                        ? R.style.SudDynamicColorThemeSettings_SetupWizard_DayNight

                        : R.style.SudDynamicColorThemeSettings_SetupWizard;

                setTheme(appliedTheme);

            }

            setTheme(R.style.SettingsPreferenceTheme_SetupWizard);

            ThemeHelper.trySetDynamicColor(this);

        }



        if (isToolbarEnabled() && !isAnySetupWizard) {