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

Remove Settings from recents after app uninstall

Browse Source 
SettingsActivity now calls finishAndRemoveTask
instead of only finish() to prevent blank
recent task from showing in overview.

Test: Visually inspected bug doesn't exist. Wrote
Roboelectric tests

Fixes: 129733119

Change-Id: I5b73c1b611e6eb52bb6665c215276efdc85c19b2
This commit is contained in:
Vinit Nayak
2019-07-01 13:24:39 -07:00
parent 6bb07bf056
commit f7d423d106
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -80,6 +80,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
PreferenceControllerMixin, LifecycleObserver, OnResume, OnDestroy,
ApplicationsState.Callbacks {
public static final String APP_CHG = "chg";
public static final String KEY_REMOVE_TASK_WHEN_FINISHING = "remove_task_when_finishing";
private static final String TAG = "AppButtonsPrefCtl";
private static final String KEY_ACTION_BUTTONS = "action_buttons";
@@ -196,7 +197,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true);
setIntentAndFinish(true, false);
}
}
}
@@ -278,9 +279,9 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
}
refreshAndFinishIfPossible();
refreshAndFinishIfPossible(true);
} else if (requestCode == mRequestRemoveDeviceAdmin) {
refreshAndFinishIfPossible();
refreshAndFinishIfPossible(false);
}
}
@@ -466,19 +467,20 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
/**
* Finish this fragment and return data if possible
*/
private void setIntentAndFinish(boolean appChanged) {
private void setIntentAndFinish(boolean appChanged, boolean removeTaskWhenFinishing) {
if (LOCAL_LOGV) {
Log.i(TAG, "appChanged=" + appChanged);
}
Intent intent = new Intent();
intent.putExtra(APP_CHG, appChanged);
intent.putExtra(KEY_REMOVE_TASK_WHEN_FINISHING, removeTaskWhenFinishing);
mActivity.finishPreferencePanel(Activity.RESULT_OK, intent);
mFinishing = true;
}
private void refreshAndFinishIfPossible() {
private void refreshAndFinishIfPossible(boolean removeTaskWhenFinishing) {
if (!refreshUi()) {
setIntentAndFinish(true);
setIntentAndFinish(true, removeTaskWhenFinishing);
} else {
startListeningToPackageRemove();
}