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

am 74c489c9: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev

Browse Source 
* commit '74c489c94ae58033c2e9d58c68fb7312f441c3fd':
  Reset Settings task when using the user switcher
This commit is contained in:
Alexandra Gherghina
2014-09-08 09:20:22 +00:00
committed by Android Git Automerger
parent b7992ade66 74c489c94a
commit 96fdef53b5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/ManageApplications.java
View File

@@ -1041,10 +1041,10 @@ public class ManageApplications extends Fragment implements
if (selectedUser.getIdentifier() != UserHandle.myUserId()) { if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
Intent intent = new Intent(Settings.ACTION_APPLICATION_SETTINGS); Intent intent = new Intent(Settings.ACTION_APPLICATION_SETTINGS);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
int currentTab = mViewPager.getCurrentItem(); int currentTab = mViewPager.getCurrentItem();
intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType); intent.putExtra(EXTRA_LIST_TYPE, mTabs.get(currentTab).mListType);
mContext.startActivityAsUser(intent, selectedUser); mContext.startActivityAsUser(intent, selectedUser);
getActivity().finish();
} }
} }

2
src/com/android/settings/notification/NotificationAppList.java
View File

@@ -156,8 +156,8 @@ public class NotificationAppList extends PinnedHeaderListFragment
if (selectedUser.getIdentifier() != UserHandle.myUserId()) { if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
Intent intent = new Intent(getActivity(), NotificationAppListActivity.class); Intent intent = new Intent(getActivity(), NotificationAppListActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
mContext.startActivityAsUser(intent, selectedUser); mContext.startActivityAsUser(intent, selectedUser);
getActivity().finish();
} }
} }

2
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -298,8 +298,8 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
if (selectedUser.getIdentifier() != UserHandle.myUserId()) { if (selectedUser.getIdentifier() != UserHandle.myUserId()) {
Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS); Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
getActivity().startActivityAsUser(intent, selectedUser); getActivity().startActivityAsUser(intent, selectedUser);
getActivity().finish();
} }
} }