summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-09-04 16:52:53 +0100
committerAlexandra Gherghina <alexgherghina@google.com>2014-09-05 11:39:39 +0100
commit56645002b2729c1f7696529e530164a031fb7978 (patch)
tree724e1d8a3936b3340b3e91eacbd070c479c30a72 /src
parent1e0ea452635fb3e8fbac733567489a38ee3ed635 (diff)
downloadpackages_apps_Settings-56645002b2729c1f7696529e530164a031fb7978.tar.gz
packages_apps_Settings-56645002b2729c1f7696529e530164a031fb7978.tar.bz2
packages_apps_Settings-56645002b2729c1f7696529e530164a031fb7978.zip
Reset Settings task when using the user switcher
Bug: 17294618 Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/applications/ManageApplications.java2
-rw-r--r--src/com/android/settings/notification/NotificationAppList.java2
-rw-r--r--src/com/android/settings/print/PrintSettingsFragment.java2
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 ac5a78ab6..e64e56e50 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 7ca4b1813..86a7de409 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 2acc7335a..3e2cd8bb7 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();
}
}