Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev

Browse Source 
am: 479d915db5

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
This commit is contained in:
Nikolas Bravo
2017-07-13 20:05:55 +00:00
committed by android-build-merger
parent 19bb6c35ca 479d915db5
commit de93e6912f
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/drawer/ProfileSelectDialog.java
View File

@@ -68,10 +68,8 @@ public class ProfileSelectDialog extends DialogFragment implements OnClickListen
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
UserHandle user = mSelectedTile.userHandle.get(which); UserHandle user = mSelectedTile.userHandle.get(which);
// Show menu on top level items. // Show menu on top level items.
mSelectedTile.intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
getActivity().startActivityAsUser(mSelectedTile.intent, user); getActivity().startActivityAsUser(mSelectedTile.intent, user);
((SettingsDrawerActivity) getActivity()).onProfileTileOpen();
} }
public static void updateUserHandlesIfNeeded(Context context, Tile tile) { public static void updateUserHandlesIfNeeded(Context context, Tile tile) {