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

Commit 801dd9d8 authored by Mathew Inwood's avatar Mathew Inwood Committed by Android (Google) Code Review
Browse files

Merge "Revert "Migrates full screen user switcher to use CarUserManagerHelper instead of""

parents d4be6389 f83b3065

packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.car; 


import android.app.ActivityManager;

import android.app.ActivityTaskManager;

import android.car.user.CarUserManagerHelper;

import android.graphics.PixelFormat;

import android.graphics.drawable.Drawable;

import android.util.Log;
@@ -29,6 +28,7 @@ import android.view.ViewGroup.LayoutParams; 
import android.view.WindowManager;



import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.settingslib.users.UserManagerHelper;

import com.android.systemui.BatteryMeterView;

import com.android.systemui.Dependency;

import com.android.systemui.Prefs;
@@ -506,7 +506,7 @@ public class CarStatusBar extends StatusBar implements 
    @Override

    public void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

        super.updateKeyguardState(goingToFullShade, fromShadeLocked);

        CarUserManagerHelper helper = new CarUserManagerHelper(mContext);

        UserManagerHelper helper = new UserManagerHelper(mContext);

        if (!helper.isHeadlessSystemUser()) {

            showUserSwitcher();

        }

packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java

+8 −6
Original line number Diff line number Diff line
@@ -18,13 +18,15 @@ package com.android.systemui.statusbar.car; 


import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.car.user.CarUserManagerHelper;

import android.content.Context;

import android.content.pm.UserInfo;

import android.util.Log;

import android.view.View;

import android.view.ViewStub;



import androidx.recyclerview.widget.GridLayoutManager;



import com.android.settingslib.users.UserManagerHelper;

import com.android.systemui.R;

import com.android.systemui.statusbar.phone.StatusBar;
@@ -37,7 +39,7 @@ public class FullscreenUserSwitcher { 
    private final UserGridRecyclerView mUserGridView;

    private final int mShortAnimDuration;

    private final StatusBar mStatusBar;

    private final CarUserManagerHelper mCarUserManagerHelper;

    private final UserManagerHelper mUserManagerHelper;

    private boolean mShowing;



    public FullscreenUserSwitcher(StatusBar statusBar, ViewStub containerStub, Context context) {
@@ -51,14 +53,14 @@ public class FullscreenUserSwitcher { 
        mUserGridView.buildAdapter();

        mUserGridView.setUserSelectionListener(this::onUserSelected);



        mCarUserManagerHelper = new CarUserManagerHelper(context);

        mUserManagerHelper = new UserManagerHelper(context);



        mShortAnimDuration = mContainer.getResources()

            .getInteger(android.R.integer.config_shortAnimTime);

    }



    public void show() {

        if (mCarUserManagerHelper.isHeadlessSystemUser()) {

        if (mUserManagerHelper.isHeadlessSystemUser()) {

            showUserGrid();

        }

        if (mShowing) {
@@ -79,12 +81,12 @@ public class FullscreenUserSwitcher { 
    }



    private void onUserSelected(UserGridRecyclerView.UserRecord record) {

        if (mCarUserManagerHelper.isHeadlessSystemUser()) {

        if (mUserManagerHelper.isHeadlessSystemUser()) {

            hideUserGrid();

        }



        if (record.mIsForeground || (record.mIsStartGuestSession

                && mCarUserManagerHelper.isForegroundUserGuest())) {

                && mUserManagerHelper.foregroundUserIsGuestUser())) {

            dismissKeyguard();

            return;

        }

packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java

+16 −18
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.content.DialogInterface.BUTTON_POSITIVE; 
import android.app.AlertDialog;

import android.app.AlertDialog.Builder;

import android.app.Dialog;

import android.car.user.CarUserManagerHelper;

import android.content.Context;

import android.content.DialogInterface;

import android.content.pm.UserInfo;
@@ -43,6 +42,7 @@ import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; 
import androidx.recyclerview.widget.RecyclerView;



import com.android.internal.util.UserIcons;

import com.android.settingslib.users.UserManagerHelper;

import com.android.systemui.R;



import com.android.systemui.statusbar.phone.SystemUIDialog;
@@ -54,16 +54,16 @@ import java.util.List; 
 * One of the uses of this is for the lock screen in auto.

 */

public class UserGridRecyclerView extends PagedListView implements

        CarUserManagerHelper.OnUsersUpdateListener {

        UserManagerHelper.OnUsersUpdateListener {

    private UserSelectionListener mUserSelectionListener;

    private UserAdapter mAdapter;

    private CarUserManagerHelper mCarUserManagerHelper;

    private UserManagerHelper mUserManagerHelper;

    private Context mContext;



    public UserGridRecyclerView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mContext = context;

        mCarUserManagerHelper = new CarUserManagerHelper(mContext);

        mUserManagerHelper = new UserManagerHelper(mContext);

    }



    /**
@@ -72,7 +72,7 @@ public class UserGridRecyclerView extends PagedListView implements 
    @Override

    public void onFinishInflate() {

        super.onFinishInflate();

        mCarUserManagerHelper.registerOnUsersUpdateListener(this);

        mUserManagerHelper.registerOnUsersUpdateListener(this);

    }



    /**
@@ -81,7 +81,7 @@ public class UserGridRecyclerView extends PagedListView implements 
    @Override

    public void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mCarUserManagerHelper.unregisterOnUsersUpdateListener(this);

        mUserManagerHelper.unregisterOnUsersUpdateListener();

    }



    /**
@@ -90,7 +90,7 @@ public class UserGridRecyclerView extends PagedListView implements 
     * @return the adapter

     */

    public void buildAdapter() {

        List<UserRecord> userRecords = createUserRecords(mCarUserManagerHelper

        List<UserRecord> userRecords = createUserRecords(mUserManagerHelper

                .getAllUsers());

        mAdapter = new UserAdapter(mContext, userRecords);

        super.setAdapter(mAdapter);
@@ -103,9 +103,7 @@ public class UserGridRecyclerView extends PagedListView implements 
                // Don't display guests in the switcher.

                continue;

            }



            boolean isForeground =

                    mCarUserManagerHelper.getCurrentForegroundUserId() == userInfo.id;

            boolean isForeground = mUserManagerHelper.getForegroundUserId() == userInfo.id;

            UserRecord record = new UserRecord(userInfo, false /* isStartGuestSession */,

                    false /* isAddUser */, isForeground);

            userRecords.add(record);
@@ -115,7 +113,7 @@ public class UserGridRecyclerView extends PagedListView implements 
        userRecords.add(createStartGuestUserRecord());



        // Add add user record if the foreground user can add users

        if (mCarUserManagerHelper.canForegroundUserAddUsers()) {

        if (mUserManagerHelper.foregroundUserCanAddUsers()) {

            userRecords.add(createAddUserRecord());

        }
@@ -149,7 +147,7 @@ public class UserGridRecyclerView extends PagedListView implements 
    @Override

    public void onUsersUpdate() {

        mAdapter.clearUsers();

        mAdapter.updateUsers(createUserRecords(mCarUserManagerHelper.getAllUsers()));

        mAdapter.updateUsers(createUserRecords(mUserManagerHelper.getAllUsers()));

        mAdapter.notifyDataSetChanged();

    }
@@ -212,7 +210,7 @@ public class UserGridRecyclerView extends PagedListView implements 


                if (userRecord.mIsStartGuestSession) {

                    notifyUserSelected(userRecord);

                    mCarUserManagerHelper.startNewGuestSession(mGuestName);

                    mUserManagerHelper.startNewGuestSession(mGuestName);

                    return;

                }
@@ -242,7 +240,7 @@ public class UserGridRecyclerView extends PagedListView implements 
                }

                // If the user doesn't want to be a guest or add a user, switch to the user selected

                notifyUserSelected(userRecord);

                mCarUserManagerHelper.switchToUser(userRecord.mInfo);

                mUserManagerHelper.switchToUser(userRecord.mInfo);

            });



        }
@@ -256,7 +254,7 @@ public class UserGridRecyclerView extends PagedListView implements 


        private Bitmap getUserRecordIcon(UserRecord userRecord) {

            if (userRecord.mIsStartGuestSession) {

                return mCarUserManagerHelper.getGuestDefaultIcon();

                return mUserManagerHelper.getGuestDefaultIcon();

            }



            if (userRecord.mIsAddUser) {
@@ -264,7 +262,7 @@ public class UserGridRecyclerView extends PagedListView implements 
                    .getDrawable(R.drawable.car_add_circle_round));

            }



            return mCarUserManagerHelper.getUserIcon(userRecord.mInfo);

            return mUserManagerHelper.getUserIcon(userRecord.mInfo);

        }



        @Override
@@ -292,7 +290,7 @@ public class UserGridRecyclerView extends PagedListView implements 


            @Override

            protected UserInfo doInBackground(String... userNames) {

                return mCarUserManagerHelper.createNewNonAdminUser(userNames[0]);

                return mUserManagerHelper.createNewUser(userNames[0]);

            }



            @Override
@@ -302,7 +300,7 @@ public class UserGridRecyclerView extends PagedListView implements 
            @Override

            protected void onPostExecute(UserInfo user) {

                if (user != null) {

                    mCarUserManagerHelper.switchToUser(user);

                    mUserManagerHelper.switchToUser(user);

                }

            }

        }