commit 80cd373263cf5fef41ad6a99317ecdcd68594734
author Alexandra Gherghina <alexgherghina@google.com> Mon Sep 08 08:04:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 08 08:04:44 2014 +0000
tree 20489e638856bc60f753961d27f6f8fa118ad69a
parent dc3193ca6364ac9215180d2adb02f5ab009abe00
parent 56645002b2729c1f7696529e530164a031fb7978

Merge "Reset Settings task when using the user switcher" into lmp-dev

src/com/android/settings/applications/ManageApplications.java

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index ac5a78a..e64e56e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1041,10 +1041,10 @@
         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();
         }
     }
 

src/com/android/settings/notification/NotificationAppList.java

diff --git a/src/com/android/settings/notification/NotificationAppList.java b/src/com/android/settings/notification/NotificationAppList.java
index 1f63084..e8b68f6 100644
--- a/src/com/android/settings/notification/NotificationAppList.java
+++ b/src/com/android/settings/notification/NotificationAppList.java
@@ -156,8 +156,8 @@
         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();
         }
     }
 

src/com/android/settings/print/PrintSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 2acc733..3e2cd8b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -298,8 +298,8 @@
         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();
         }
     }