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

Merge "Fix windows leaked in ZenModeScheduleRuleSettings"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-31 16:35:10 +00:00
committed by Android (Google) Code Review
parent d0898cd6a3 4b5cbca5c8
commit 919334c04f
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
View File

@@ -63,6 +63,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
private TimePickerPreference mStart; private TimePickerPreference mStart;
private TimePickerPreference mEnd; private TimePickerPreference mEnd;
private SwitchPreference mExitAtAlarm; private SwitchPreference mExitAtAlarm;
private AlertDialog mDayDialog;
private ScheduleInfo mSchedule; private ScheduleInfo mSchedule;
@@ -195,7 +196,6 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
updateEndSummary(); updateEndSummary();
} }
@Override @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>(); List<AbstractPreferenceController> controllers = new ArrayList<>();
@@ -214,8 +214,17 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
return MetricsEvent.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE; return MetricsEvent.NOTIFICATION_ZEN_MODE_SCHEDULE_RULE;
} }
@Override
public void onDestroy() {
super.onDestroy();
if (mDayDialog != null && mDayDialog.isShowing()) {
mDayDialog.dismiss();
mDayDialog = null;
}
}
private void showDaysDialog() { private void showDaysDialog() {
new AlertDialog.Builder(mContext) mDayDialog = new AlertDialog.Builder(mContext)
.setTitle(R.string.zen_mode_schedule_rule_days) .setTitle(R.string.zen_mode_schedule_rule_days)
.setView(new ZenModeScheduleDaysSelection(mContext, mSchedule.days) { .setView(new ZenModeScheduleDaysSelection(mContext, mSchedule.days) {
@Override @Override
@@ -249,7 +258,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
super(context); super(context);
mContext = context; mContext = context;
setPersistent(false); setPersistent(false);
setOnPreferenceClickListener(new OnPreferenceClickListener(){ setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
final TimePickerFragment frag = new TimePickerFragment(); final TimePickerFragment frag = new TimePickerFragment();