From 56645002b2729c1f7696529e530164a031fb7978 Mon Sep 17 00:00:00 2001 From: Alexandra Gherghina Date: Thu, 4 Sep 2014 16:52:53 +0100 Subject: [PATCH] Reset Settings task when using the user switcher Bug: 17294618 Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20 --- src/com/android/settings/applications/ManageApplications.java | 2 +- src/com/android/settings/notification/NotificationAppList.java | 2 +- src/com/android/settings/print/PrintSettingsFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index ac5a78ab6ae..e64e56e504f 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -1041,10 +1041,10 @@ public class ManageApplications extends Fragment implements if (selectedUser.getIdentifier() != UserHandle.myUserId()) { Intent intent = new Intent(Settings.ACTION_APPLICATION_SETTINGS); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); int currentTab = mViewPager.getCurrentItem(); intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType); mContext.startActivityAsUser(intent, selectedUser); - getActivity().finish(); } } diff --git a/src/com/android/settings/notification/NotificationAppList.java b/src/com/android/settings/notification/NotificationAppList.java index 7ca4b18136b..86a7de409c1 100644 --- a/src/com/android/settings/notification/NotificationAppList.java +++ b/src/com/android/settings/notification/NotificationAppList.java @@ -155,8 +155,8 @@ public class NotificationAppList extends PinnedHeaderListFragment if (selectedUser.getIdentifier() != UserHandle.myUserId()) { Intent intent = new Intent(getActivity(), NotificationAppListActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); mContext.startActivityAsUser(intent, selectedUser); - getActivity().finish(); } } diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 2acc7335a75..3e2cd8bb7a8 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -298,8 +298,8 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment if (selectedUser.getIdentifier() != UserHandle.myUserId()) { Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); getActivity().startActivityAsUser(intent, selectedUser); - getActivity().finish(); } }