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

Merge "Setting result earlier than onPause" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-19 20:11:09 +00:00
committed by Android (Google) Code Review
parent 3616520985 63fd87a13a
commit c57c351060
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
View File

@@ -81,6 +81,9 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader
if (savedInstanceState != null) { if (savedInstanceState != null) {
mUncommittedState = (Boolean) savedInstanceState.get(UNCOMMITTED_STATE_KEY); mUncommittedState = (Boolean) savedInstanceState.get(UNCOMMITTED_STATE_KEY);
if (mUncommittedState != null && isAppSpecific()) {
setResult(mUncommittedState ? RESULT_OK : RESULT_CANCELED);
}
} }
addPreferencesFromResource(R.xml.alarms_and_reminders); addPreferencesFromResource(R.xml.alarms_and_reminders);
mSwitchPref = findPreference(KEY_SWITCH); mSwitchPref = findPreference(KEY_SWITCH);
@@ -97,9 +100,11 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean checked = (Boolean) newValue;
if (preference == mSwitchPref) { if (preference == mSwitchPref) {
mUncommittedState = checked; mUncommittedState = (Boolean) newValue;
if (isAppSpecific()) {
setResult(mUncommittedState ? RESULT_OK : RESULT_CANCELED);
}
refreshUi(); refreshUi();
return true; return true;
} }
@@ -125,6 +130,11 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader
newState ? 1 : 0); newState ? 1 : 0);
} }
private boolean isAppSpecific() {
return Settings.AlarmsAndRemindersAppActivity.class.getName().equals(
getIntent().getComponent().getClassName());
}
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
@@ -133,10 +143,6 @@ public class AlarmsAndRemindersDetails extends AppInfoWithHeader
} }
if (mPermissionState != null && mUncommittedState != null if (mPermissionState != null && mUncommittedState != null
&& mUncommittedState != mPermissionState.isAllowed()) { && mUncommittedState != mPermissionState.isAllowed()) {
if (Settings.AlarmsAndRemindersAppActivity.class.getName().equals(
getIntent().getComponent().getClassName())) {
setResult(mUncommittedState ? RESULT_OK : RESULT_CANCELED);
}
setCanScheduleAlarms(mUncommittedState); setCanScheduleAlarms(mUncommittedState);
logPermissionChange(mUncommittedState, mPackageName); logPermissionChange(mUncommittedState, mPackageName);
mUncommittedState = null; mUncommittedState = null;