diff options
| author | Vinit Nayak <peanutbutter@google.com> | 2019-07-01 13:24:39 -0700 |
|---|---|---|
| committer | Vinit Nayak <peanutbutter@google.com> | 2019-07-11 16:09:49 -0700 |
| commit | f7d423d106321e11007dd927539fd56e1a5e880b (patch) | |
| tree | 2eeea8c6acbbd81bfa8cecf116bc3cef81da241c /src/com/android/settings/SettingsActivity.java | |
| parent | 6bb07bf056cb8d38b3129ab516de5627c8c5326e (diff) | |
| download | packages_apps_Settings-f7d423d106321e11007dd927539fd56e1a5e880b.tar.gz packages_apps_Settings-f7d423d106321e11007dd927539fd56e1a5e880b.tar.bz2 packages_apps_Settings-f7d423d106321e11007dd927539fd56e1a5e880b.zip | |
Remove Settings from recents after app uninstall
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
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 3b01b327ea..b822a83263 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settings.applications.appinfo.AppButtonsPreferenceController.KEY_REMOVE_TASK_WHEN_FINISHING; + import android.app.ActionBar; import android.app.ActivityManager; import android.content.BroadcastReceiver; @@ -542,7 +544,12 @@ public class SettingsActivity extends SettingsBaseActivity */ public void finishPreferencePanel(int resultCode, Intent resultData) { setResult(resultCode, resultData); - finish(); + if (resultData != null && + resultData.getBooleanExtra(KEY_REMOVE_TASK_WHEN_FINISHING, false)) { + finishAndRemoveTask(); + } else { + finish(); + } } /** |