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

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

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

Change-Id: I453111dade7866a70c02cd9da7175ce112903e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2022-04-06 14:59:34 +00:00
committed by Automerger Merge Worker
parent 2473634d72 2caba70028
commit c92af2b605
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/zen/ZenCustomRuleSettingsBase.java
View File

@@ -59,6 +59,10 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
@Override @Override
public void onResume() { public void onResume() {
if (!mIsFirstLaunch) {
// Rule will be used in updatePreferenceStates() in super.onResume().
updateRule();
}
super.onResume(); super.onResume();
updatePreferences(); updatePreferences();
} }
@@ -66,6 +70,7 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
@Override @Override
public void onZenModeConfigChanged() { public void onZenModeConfigChanged() {
super.onZenModeConfigChanged(); super.onZenModeConfigChanged();
updateRule();
updatePreferences(); updatePreferences();
updatePreferenceStates(); updatePreferenceStates();
} }
@@ -80,10 +85,6 @@ abstract class ZenCustomRuleSettingsBase extends ZenModeSettingsBase {
} }
public void updatePreferences() { public void updatePreferences() {
if (!mIsFirstLaunch) {
updateRule();
}
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
String categoryKey = getPreferenceCategoryKey(); String categoryKey = getPreferenceCategoryKey();
if (categoryKey != null) { if (categoryKey != null) {