Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev (479d915d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/drawer/ProfileSelectDialog.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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) {