Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de93e691 authored by Nikolas Bravo's avatar Nikolas Bravo Committed by android-build-merger
Browse files

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

am: 479d915d

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
parents 19bb6c35 479d915d

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

+0 −2
Original line number Diff line number Diff line
@@ -68,10 +68,8 @@ public class ProfileSelectDialog extends DialogFragment implements OnClickListen 
    public void onClick(DialogInterface dialog, int which) {

        UserHandle user = mSelectedTile.userHandle.get(which);

        // Show menu on top level items.

        mSelectedTile.intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);

        mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);

        getActivity().startActivityAsUser(mSelectedTile.intent, user);

        ((SettingsDrawerActivity) getActivity()).onProfileTileOpen();

    }



    public static void updateUserHandlesIfNeeded(Context context, Tile tile) {