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

Commit c92af2b6 authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into... 

Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod am: 2caba700

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



Change-Id: I453111dade7866a70c02cd9da7175ce112903e32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2473634d 2caba700

src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java

+5 −4
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase { 


    @Override

    public void onResume() {

        if (!mIsFirstLaunch) {

            // Rule will be used in updatePreferenceStates() in super.onResume().

            updateRule();

        }

        super.onResume();

        updatePreferences();

    }
@@ -66,6 +70,7 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase { 
    @Override

    public void onZenModeConfigChanged() {

        super.onZenModeConfigChanged();

        updateRule();

        updatePreferences();

        updatePreferenceStates();

    }
@@ -80,10 +85,6 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase { 
    }



    public void updatePreferences() {

        if (!mIsFirstLaunch) {

            updateRule();

        }



        final PreferenceScreen screen = getPreferenceScreen();

        String categoryKey = getPreferenceCategoryKey();

        if (categoryKey != null) {