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

Commit 0c27903d authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

Remove MultiUserSwitch from KeyguardStatusBarView 

Instead of MultiUserSwitch (a tappable view for opening the
KeyguardUserSwitcher), use an ImageView for showing the multi-user
avatar.

Also,

 - Remove KeyguardUserSwitcher from MultiUserSwitch. MultiUserSwitch
   will only be used for opening the QS user switcher now.

 - Cleanup other dependencies. For example,
   NotificationPanelViewController no longer needs QSDetailDisplayer.

NOTE: This change breaks KeyguardUserSwitcher since there is now no way
to open it. A follow-up change will introduce a new entry-point for
opening the switcher.

The QS user switcher will continue to work because it is handled by a
different instance of MultiUserSwitch (QSFooterView).

Test: setprop fw.max_users 1, on keyguard, confirm that user icon is not
      in status bar
Test: setprop fw.max_users 2, on keyguard, confirm that user icon is in
      status bar
Bug: 169783558
Change-Id: If93902985c3dc22be0cfa8b91d37cd9b3deced2f
parent 7a6f5495

packages/SystemUI/res/layout/keyguard_status_bar.xml

+6 −11
Original line number Diff line number Diff line
@@ -43,17 +43,12 @@ 
            <include layout="@layout/system_icons" />

        </FrameLayout>



        <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"

            android:layout_width="@dimen/multi_user_switch_width_keyguard"

            android:layout_height="match_parent"

            android:background="@drawable/ripple_drawable"

            android:layout_marginEnd="@dimen/multi_user_switch_keyguard_margin">



        <ImageView android:id="@+id/multi_user_avatar"

            android:layout_width="@dimen/multi_user_avatar_keyguard_size"

            android:layout_height="@dimen/multi_user_avatar_keyguard_size"

            android:layout_gravity="center"

            android:scaleType="centerInside"/>

        </com.android.systemui.statusbar.phone.MultiUserSwitch>

    </LinearLayout>



    <Space

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

+32 −53
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.ScreenDecorations.DisplayCutoutView.boundsFromDirection;



import android.annotation.ColorInt;
@@ -25,6 +26,7 @@ import android.content.res.Resources; 
import android.graphics.Color;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.UserManager;

import android.util.AttributeSet;

import android.util.Pair;

import android.util.TypedValue;
@@ -45,7 +47,6 @@ import com.android.systemui.Dependency; 
import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.plugins.DarkIconDispatcher.DarkReceiver;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

import com.android.systemui.statusbar.policy.BatteryController;
@@ -56,7 +57,6 @@ import com.android.systemui.statusbar.policy.KeyguardUserSwitcher; 
import com.android.systemui.statusbar.policy.UserInfoController;

import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;

import com.android.systemui.statusbar.policy.UserInfoControllerImpl;

import com.android.systemui.statusbar.policy.UserSwitcherController;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -79,14 +79,13 @@ public class KeyguardStatusBarView extends RelativeLayout 
    private boolean mBatteryListening;



    private TextView mCarrierLabel;

    private MultiUserSwitch mMultiUserSwitch;

    private ImageView mMultiUserAvatar;

    private BatteryMeterView mBatteryView;

    private StatusIconContainer mStatusIconContainer;



    private BatteryController mBatteryController;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private UserSwitcherController mUserSwitcherController;

    private final UserManager mUserManager;



    private int mSystemIconsSwitcherHiddenExpandedMargin;

    private int mSystemIconsBaseMargin;
@@ -109,13 +108,13 @@ public class KeyguardStatusBarView extends RelativeLayout 


    public KeyguardStatusBarView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mUserManager = UserManager.get(getContext());

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mSystemIconsContainer = findViewById(R.id.system_icons_container);

        mMultiUserSwitch = findViewById(R.id.multi_user_switch);

        mMultiUserAvatar = findViewById(R.id.multi_user_avatar);

        mCarrierLabel = findViewById(R.id.keyguard_carrier_text);

        mBatteryView = mSystemIconsContainer.findViewById(R.id.battery);
@@ -124,7 +123,6 @@ public class KeyguardStatusBarView extends RelativeLayout 
        mStatusIconContainer = findViewById(R.id.statusIcons);



        loadDimens();

        updateUserSwitcher();

        mBatteryController = Dependency.get(BatteryController.class);

    }
@@ -137,14 +135,6 @@ public class KeyguardStatusBarView extends RelativeLayout 
                R.dimen.multi_user_avatar_keyguard_size);

        mMultiUserAvatar.setLayoutParams(lp);



        // Multi-user switch

        lp = (MarginLayoutParams) mMultiUserSwitch.getLayoutParams();

        lp.width = getResources().getDimensionPixelSize(

                R.dimen.multi_user_switch_width_keyguard);

        lp.setMarginEnd(getResources().getDimensionPixelSize(

                R.dimen.multi_user_switch_keyguard_margin));

        mMultiUserSwitch.setLayoutParams(lp);



        // System icons

        lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams();

        lp.setMarginStart(getResources().getDimensionPixelSize(
@@ -194,22 +184,27 @@ public class KeyguardStatusBarView extends RelativeLayout 
    }



    private void updateVisibilities() {

        if (mMultiUserSwitch.getParent() != mStatusIconArea && !mKeyguardUserSwitcherShowing) {

            if (mMultiUserSwitch.getParent() != null) {

                getOverlay().remove(mMultiUserSwitch);

        if (mMultiUserAvatar.getParent() != mStatusIconArea && !mKeyguardUserSwitcherShowing) {

            if (mMultiUserAvatar.getParent() != null) {

                getOverlay().remove(mMultiUserAvatar);

            }

            mStatusIconArea.addView(mMultiUserSwitch, 0);

        } else if (mMultiUserSwitch.getParent() == mStatusIconArea && mKeyguardUserSwitcherShowing) {

            mStatusIconArea.removeView(mMultiUserSwitch);

            mStatusIconArea.addView(mMultiUserAvatar, 0);

        } else if (mMultiUserAvatar.getParent() == mStatusIconArea

                && mKeyguardUserSwitcherShowing) {

            mStatusIconArea.removeView(mMultiUserAvatar);

        }

        if (mKeyguardUserSwitcher == null) {

            // If we have no keyguard switcher, the screen width is under 600dp. In this case,

            // we only show the multi-user switch if it's enabled through UserManager as well as

            // by the user.

            if (mMultiUserSwitch.isMultiUserEnabled()) {

                mMultiUserSwitch.setVisibility(View.VISIBLE);

            // TODO(b/138661450) Move IPC calls to background

            boolean isMultiUserEnabled = whitelistIpcs(() -> mUserManager.isUserSwitcherEnabled(

                    mContext.getResources().getBoolean(

                            R.bool.qs_show_user_switcher_for_single_user)));

            if (isMultiUserEnabled) {

                mMultiUserAvatar.setVisibility(View.VISIBLE);

            } else {

                mMultiUserSwitch.setVisibility(View.GONE);

                mMultiUserAvatar.setVisibility(View.GONE);

            }

        }

        mBatteryView.setForceShowPercent(mBatteryCharging && mShowPercentAvailable);
@@ -220,7 +215,7 @@ public class KeyguardStatusBarView extends RelativeLayout 
                (LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();

        // If the avatar icon is gone, we need to have some end margin to display the system icons

        // correctly.

        int baseMarginEnd = mMultiUserSwitch.getVisibility() == View.GONE

        int baseMarginEnd = mMultiUserAvatar.getVisibility() == View.GONE

                ? mSystemIconsBaseMargin

                : 0;

        int marginEnd = mKeyguardUserSwitcherShowing ? mSystemIconsSwitcherHiddenExpandedMargin :
@@ -334,20 +329,11 @@ public class KeyguardStatusBarView extends RelativeLayout 
        }

    }



    private void updateUserSwitcher() {

        boolean keyguardSwitcherAvailable = mKeyguardUserSwitcher != null;

        mMultiUserSwitch.setClickable(keyguardSwitcherAvailable);

        mMultiUserSwitch.setFocusable(keyguardSwitcherAvailable);

        mMultiUserSwitch.setKeyguardMode(keyguardSwitcherAvailable);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        UserInfoController userInfoController = Dependency.get(UserInfoController.class);

        userInfoController.addCallback(this);

        mUserSwitcherController = Dependency.get(UserSwitcherController.class);

        mMultiUserSwitch.setUserSwitcherController(mUserSwitcherController);

        userInfoController.reloadUserInfo();

        Dependency.get(ConfigurationController.class).addCallback(this);

        mIconManager = new TintedIconManager(findViewById(R.id.statusIcons),
@@ -369,11 +355,6 @@ public class KeyguardStatusBarView extends RelativeLayout 
        mMultiUserAvatar.setImageDrawable(picture);

    }



    /** */

    public void setQSDetailDisplayer(QSDetailDisplayer detailDisplayer) {

        mMultiUserSwitch.setQSDetailDisplayer(detailDisplayer);

    }



    @Override

    public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {

        if (mBatteryCharging != charging) {
@@ -389,8 +370,6 @@ public class KeyguardStatusBarView extends RelativeLayout 


    public void setKeyguardUserSwitcher(KeyguardUserSwitcher keyguardUserSwitcher) {

        mKeyguardUserSwitcher = keyguardUserSwitcher;

        mMultiUserSwitch.setKeyguardUserSwitcher(keyguardUserSwitcher);

        updateUserSwitcher();

    }



    public void setKeyguardUserSwitcherShowing(boolean showing, boolean animate) {
@@ -405,36 +384,36 @@ public class KeyguardStatusBarView extends RelativeLayout 


    private void animateNextLayoutChange() {

        final int systemIconsCurrentX = mSystemIconsContainer.getLeft();

        final boolean userSwitcherVisible = mMultiUserSwitch.getParent() == mStatusIconArea;

        final boolean userAvatarVisible = mMultiUserAvatar.getParent() == mStatusIconArea;

        getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {

            @Override

            public boolean onPreDraw() {

                getViewTreeObserver().removeOnPreDrawListener(this);

                boolean userSwitcherHiding = userSwitcherVisible

                        && mMultiUserSwitch.getParent() != mStatusIconArea;

                boolean userAvatarHiding = userAvatarVisible

                        && mMultiUserAvatar.getParent() != mStatusIconArea;

                mSystemIconsContainer.setX(systemIconsCurrentX);

                mSystemIconsContainer.animate()

                        .translationX(0)

                        .setDuration(400)

                        .setStartDelay(userSwitcherHiding ? 300 : 0)

                        .setStartDelay(userAvatarHiding ? 300 : 0)

                        .setInterpolator(Interpolators.FAST_OUT_SLOW_IN)

                        .start();

                if (userSwitcherHiding) {

                    getOverlay().add(mMultiUserSwitch);

                    mMultiUserSwitch.animate()

                if (userAvatarHiding) {

                    getOverlay().add(mMultiUserAvatar);

                    mMultiUserAvatar.animate()

                            .alpha(0f)

                            .setDuration(300)

                            .setStartDelay(0)

                            .setInterpolator(Interpolators.ALPHA_OUT)

                            .withEndAction(() -> {

                                mMultiUserSwitch.setAlpha(1f);

                                getOverlay().remove(mMultiUserSwitch);

                                mMultiUserAvatar.setAlpha(1f);

                                getOverlay().remove(mMultiUserAvatar);

                            })

                            .start();



                } else {

                    mMultiUserSwitch.setAlpha(0f);

                    mMultiUserSwitch.animate()

                    mMultiUserAvatar.setAlpha(0f);

                    mMultiUserAvatar.animate()

                            .alpha(1f)

                            .setDuration(300)

                            .setStartDelay(200)
@@ -452,8 +431,8 @@ public class KeyguardStatusBarView extends RelativeLayout 
        if (visibility != View.VISIBLE) {

            mSystemIconsContainer.animate().cancel();

            mSystemIconsContainer.setTranslationX(0);

            mMultiUserSwitch.animate().cancel();

            mMultiUserSwitch.setAlpha(1f);

            mMultiUserAvatar.animate().cancel();

            mMultiUserAvatar.setAlpha(1f);

        } else {

            updateVisibilities();

            updateSystemIconsLayoutParams();

packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java

+1 −17
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.systemui.Prefs.Key; 
import com.android.systemui.R;

import com.android.systemui.plugins.qs.DetailAdapter;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;

import com.android.systemui.statusbar.policy.UserSwitcherController;



/**
@@ -44,8 +43,6 @@ import com.android.systemui.statusbar.policy.UserSwitcherController; 
public class MultiUserSwitch extends FrameLayout implements View.OnClickListener {



    protected QSDetailDisplayer mQSDetailDisplayer;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private boolean mKeyguardMode;

    private UserSwitcherController.BaseUserAdapter mUserListener;



    final UserManager mUserManager;
@@ -85,15 +82,6 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 
        refreshContentDescription();

    }



    public void setKeyguardUserSwitcher(KeyguardUserSwitcher keyguardUserSwitcher) {

        mKeyguardUserSwitcher = keyguardUserSwitcher;

    }



    public void setKeyguardMode(boolean keyguardShowing) {

        mKeyguardMode = keyguardShowing;

        registerListener();

    }



    public boolean isMultiUserEnabled() {

        // TODO(b/138661450) Move IPC calls to background

        return whitelistIpcs(() -> mUserManager.isUserSwitcherEnabled(
@@ -123,11 +111,7 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener 


    @Override

    public void onClick(View v) {

        if (mKeyguardMode) {

            if (mKeyguardUserSwitcher != null) {

                mKeyguardUserSwitcher.show(true /* animate */);

            }

        } else if (mQSDetailDisplayer != null && mUserSwitcherController != null) {

        if (mQSDetailDisplayer != null && mUserSwitcherController != null) {

            View center = getChildCount() > 0 ? getChildAt(0) : this;



            int[] tmpInt = new int[2];

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+0 −5
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.plugins.qs.QS;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.GestureRecorder;
@@ -295,7 +294,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private final MediaHierarchyManager mMediaHierarchyManager;

    private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final QSDetailDisplayer mQSDetailDisplayer;

    private final FeatureFlags mFeatureFlags;

    private final ScrimController mScrimController;

    private final ControlsComponent mControlsComponent;
@@ -559,7 +557,6 @@ public class NotificationPanelViewController extends PanelViewController { 
            NotificationGroupManagerLegacy groupManager,

            NotificationIconAreaController notificationIconAreaController,

            AuthController authController,

            QSDetailDisplayer qsDetailDisplayer,

            ScrimController scrimController,

            MediaDataManager mediaDataManager,

            AmbientState ambientState,
@@ -581,7 +578,6 @@ public class NotificationPanelViewController extends PanelViewController { 
        mGroupManager = groupManager;

        mNotificationIconAreaController = notificationIconAreaController;

        mKeyguardStatusViewComponentFactory = keyguardStatusViewComponentFactory;

        mQSDetailDisplayer = qsDetailDisplayer;

        mFeatureFlags = featureFlags;

        mView.setWillNotDraw(!DEBUG);

        mLayoutInflater = layoutInflater;
@@ -660,7 +656,6 @@ public class NotificationPanelViewController extends PanelViewController { 
    private void onFinishInflate() {

        loadDimens();

        mKeyguardStatusBar = mView.findViewById(R.id.keyguard_header);

        mKeyguardStatusBar.setQSDetailDisplayer(mQSDetailDisplayer);

        mBigClockContainer = mView.findViewById(R.id.big_clock_container);

        updateViewControllers(mView.findViewById(R.id.keyguard_status_view));

        mNotificationContainerParent = mView.findViewById(R.id.notification_container_parent);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewTest.java

+0 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ import com.android.systemui.controls.dagger.ControlsComponent; 
import com.android.systemui.doze.DozeLog;

import com.android.systemui.media.MediaDataManager;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.qs.QSDetailDisplayer;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.FeatureFlags;

import com.android.systemui.statusbar.KeyguardAffordanceView;
@@ -302,7 +301,6 @@ public class NotificationPanelViewTest extends SysuiTestCase { 
                mGroupManager,

                mNotificationAreaController,

                mAuthController,

                new QSDetailDisplayer(),

                mScrimController,

                mMediaDataManager,

                mAmbientState,