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

Commit 2790a37e authored by Rakesh Iyer's avatar Rakesh Iyer
Browse files

Move FullscreenUserSwitcher into car/ 

Move the full screen user switcher into the car/ directory
because it is only used there.

Bug: 26559008
Change-Id: I4f24b2029ed11be49a165be35e225e726677d37e
parent 6feab9fb

packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml

+2 −2
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ 
            android:paddingStart="@dimen/car_lockscreen_disclaimer_text_padding_start"

            android:paddingEnd="@dimen/car_lockscreen_disclaimer_text_padding_end"

            android:paddingTop="@dimen/car_lockscreen_disclaimer_text_padding_top" />

        <com.android.systemui.statusbar.UserGridView

        <com.android.systemui.statusbar.car.UserGridView

            android:id="@+id/user_grid"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="@dimen/car_lockscreen_user_grid_view_padding_top"

            android:stretchMode="columnWidth">

        </com.android.systemui.statusbar.UserGridView>

        </com.android.systemui.statusbar.car.UserGridView>

    </LinearLayout>

</FrameLayout>

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

+33 −0
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ import android.os.Handler; 
import android.os.Looper;

import android.view.View;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewStub;

import android.view.WindowManager;



import com.android.systemui.R;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.phone.PhoneStatusBar;



/**
@@ -41,6 +43,7 @@ public class CarStatusBar extends PhoneStatusBar { 


    private CarNavigationBarView mCarNavigationBar;

    private CarNavigationBarController mController;

    private FullscreenUserSwitcher mFullscreenUserSwitcher;



    @Override

    public void start() {
@@ -121,4 +124,34 @@ public class CarStatusBar extends PhoneStatusBar { 
            }

        }

    }



    @Override

    protected void createUserSwitcher() {

        if (mUserSwitcherController.useFullscreenUserSwitcher()) {

            mFullscreenUserSwitcher = new FullscreenUserSwitcher(this, mUserSwitcherController,

                    (ViewStub) mStatusBarWindow.findViewById(R.id.fullscreen_user_switcher_stub));

        } else {

            super.createUserSwitcher();

        }

    }



    @Override

    public void userSwitched(int newUserId) {

        super.userSwitched(newUserId);

        if (mFullscreenUserSwitcher != null) {

            mFullscreenUserSwitcher.onUserSwitched(newUserId);

        }

    }



    @Override

    public void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

        super.updateKeyguardState(goingToFullShade, fromShadeLocked);

        if (mFullscreenUserSwitcher != null) {

            if (mState == StatusBarState.FULLSCREEN_USER_SWITCHER) {

                mFullscreenUserSwitcher.show();

            } else {

                mFullscreenUserSwitcher.hide();

            }

        }

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.systemui.statusbar.policy;

package com.android.systemui.statusbar.car;



import android.content.Context;

import android.provider.Settings;
@@ -22,8 +22,8 @@ import android.view.View; 
import android.view.ViewStub;



import com.android.systemui.R;

import com.android.systemui.statusbar.UserGridView;

import com.android.systemui.statusbar.phone.PhoneStatusBar;

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



/**

 * Manages the fullscreen user switcher.

packages/SystemUI/src/com/android/systemui/statusbar/UserGridView.java→packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridView.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.systemui.statusbar;

package com.android.systemui.statusbar.car;



import android.content.Context;

import android.content.DialogInterface;

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

+9 −23
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ import com.android.systemui.statusbar.policy.BluetoothControllerImpl; 
import com.android.systemui.statusbar.policy.BrightnessMirrorController;

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

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

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

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

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

import com.android.systemui.statusbar.policy.KeyguardMonitor;
@@ -285,7 +284,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    protected KeyguardMonitor mKeyguardMonitor;

    BrightnessMirrorController mBrightnessMirrorController;

    AccessibilityController mAccessibilityController;

    FullscreenUserSwitcher mFullscreenUserSwitcher;

    FingerprintUnlockController mFingerprintUnlockController;



    int mNaturalBarHeight = -1;
@@ -854,16 +852,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        if (UserManager.get(mContext).isUserSwitcherEnabled()) {

            mUserSwitcherController = new UserSwitcherController(mContext, mKeyguardMonitor,

                    mHandler, this);

            if (mUserSwitcherController.useFullscreenUserSwitcher()) {

                mFullscreenUserSwitcher = new FullscreenUserSwitcher(this, mUserSwitcherController,

                        (ViewStub) mStatusBarWindow.findViewById(

                                R.id.fullscreen_user_switcher_stub));

            } else {

                // Fullscreen user switcher does not show keyguard. Hence no KeyguardUserSwitcher.

                mKeyguardUserSwitcher = new KeyguardUserSwitcher(mContext,

                        (ViewStub) mStatusBarWindow.findViewById(R.id.keyguard_user_switcher),

                        mKeyguardStatusBar, mNotificationPanel, mUserSwitcherController);

            }

            createUserSwitcher();

        }



        // Set up the quick settings tile panel
@@ -934,6 +923,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        return mStatusBarView;

    }



    protected void createUserSwitcher() {

        mKeyguardUserSwitcher = new KeyguardUserSwitcher(mContext,

                (ViewStub) mStatusBarWindow.findViewById(R.id.keyguard_user_switcher),

                mKeyguardStatusBar, mNotificationPanel, mUserSwitcherController);

    }



    protected void inflateStatusBarWindow(Context context) {

        mStatusBarWindow = (StatusBarWindowView) View.inflate(context,

                R.layout.super_status_bar, null);
@@ -3093,9 +3088,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        setControllerUsers();

        clearCurrentMediaNotification();

        updateMediaMetaData(true);

        if (mFullscreenUserSwitcher != null) {

            mFullscreenUserSwitcher.onUserSwitched(newUserId);

        }

    }



    private void setControllerUsers() {
@@ -3720,7 +3712,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                        .isSecure(mCurrentUserId));

    }



    private void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

    protected void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

        if (mState == StatusBarState.KEYGUARD) {

            mKeyguardIndicationController.setVisible(true);

            mNotificationPanel.resetViews();
@@ -3744,13 +3736,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mScrimController.setKeyguardShowing(false);

            mIconPolicy.setKeyguardShowing(false);

        }

        if (mFullscreenUserSwitcher != null) {

            if (mState == StatusBarState.FULLSCREEN_USER_SWITCHER) {

                mFullscreenUserSwitcher.show();

            } else {

                mFullscreenUserSwitcher.hide();

            }

        }



        mNotificationPanel.setBarState(mState, mKeyguardFadingAway, goingToFullShade);

        updateDozingState();

        updatePublicMode();