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

Refresh the whole rule in zen listing screen am: 78ef02eb8f

Browse Source 
am: 39bff61eea

Change-Id: I77d343b8a0ccb1658c6a9c090d93cde7a06984af
This commit is contained in:
Julia Reynolds
2019-06-13 11:33:23 -07:00
committed by android-build-merger
parent d7f6cf0691 39bff61eea
commit 01be0f85b3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
View File

@@ -69,7 +69,7 @@ public class ZenModeAutomaticRulesPreferenceController extends
for (int i = 0; i < sortedRules.length; i++) { for (int i = 0; i < sortedRules.length; i++) {
ZenRulePreference pref = (ZenRulePreference) mPreferenceCategory.getPreference(i); ZenRulePreference pref = (ZenRulePreference) mPreferenceCategory.getPreference(i);
// we are either: // we are either:
// 1. updating the enabled state or name of the rule // 1. updating everything about the rule
// 2. rule was added or deleted, so reload the entire list // 2. rule was added or deleted, so reload the entire list
if (Objects.equals(pref.mId, sortedRules[i].getKey())) { if (Objects.equals(pref.mId, sortedRules[i].getKey())) {
AutomaticZenRule rule = sortedRules[i].getValue(); AutomaticZenRule rule = sortedRules[i].getValue();

6
src/com/android/settings/notification/ZenRulePreference.java
View File

@@ -49,7 +49,7 @@ public class ZenRulePreference extends TwoTargetPreference {
final ZenServiceListing mServiceListing; final ZenServiceListing mServiceListing;
final PackageManager mPm; final PackageManager mPm;
final MetricsFeatureProvider mMetricsFeatureProvider; final MetricsFeatureProvider mMetricsFeatureProvider;
final AutomaticZenRule mRule; AutomaticZenRule mRule;
CharSequence mName; CharSequence mName;
private Intent mIntent; private Intent mIntent;
@@ -122,14 +122,14 @@ public class ZenRulePreference extends TwoTargetPreference {
if (!mRule.getName().equals(rule.getName())) { if (!mRule.getName().equals(rule.getName())) {
mName = rule.getName(); mName = rule.getName();
setTitle(mName); setTitle(mName);
mRule.setName(mName.toString());
} }
if (mRule.isEnabled() != rule.isEnabled()) { if (mRule.isEnabled() != rule.isEnabled()) {
mRule.setEnabled(rule.isEnabled());
setChecked(mRule.isEnabled()); setChecked(mRule.isEnabled());
setSummary(computeRuleSummary(mRule)); setSummary(computeRuleSummary(mRule));
} }
mRule = rule;
} }
@Override @Override