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

Commit 57f4c234 authored by Heemin Seog's avatar Heemin Seog Committed by Automerger Merge Worker
Browse files

Merge "Address multi display nav bar crash" into rvc-dev am: 7674c6bb 

Change-Id: Ib9f80d53e4e2b0a904e5fc57cd7ef19c8e2b1a14
parents 3837ed25 7674c6bb

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+0 −9
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.statusbar.AutoHideUiElement;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

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

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

import com.android.systemui.statusbar.phone.PhoneStatusBarPolicy;
@@ -78,7 +77,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
    private final ButtonSelectionStateListener mButtonSelectionStateListener;

    private final Handler mMainHandler;

    private final Lazy<KeyguardStateController> mKeyguardStateControllerLazy;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final ButtonSelectionStateController mButtonSelectionStateController;

    private final PhoneStatusBarPolicy mIconPolicy;

    private final StatusBarIconController mIconController;
@@ -124,7 +122,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
            ButtonSelectionStateListener buttonSelectionStateListener,

            @Main Handler mainHandler,

            Lazy<KeyguardStateController> keyguardStateControllerLazy,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            ButtonSelectionStateController buttonSelectionStateController,

            PhoneStatusBarPolicy iconPolicy,

            StatusBarIconController iconController
@@ -139,7 +136,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
        mButtonSelectionStateListener = buttonSelectionStateListener;

        mMainHandler = mainHandler;

        mKeyguardStateControllerLazy = keyguardStateControllerLazy;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

        mButtonSelectionStateController = buttonSelectionStateController;

        mIconPolicy = iconPolicy;

        mIconController = iconController;
@@ -315,11 +311,6 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 
                    result.mImeWindowVis, result.mImeBackDisposition,

                    result.mShowImeSwitcher);

        }



        // There has been a car customized nav bar on the default display, so just create nav bars

        // on external displays.

        mNavigationBarControllerLazy.get().createNavigationBars(/* includeDefaultDisplay= */ false,

                result);

    }



    private void buildNavBarWindows() {

packages/CarSystemUI/tests/src/com/android/systemui/navigationbar/car/CarNavigationBarTest.java

+2 −5
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.systemui.R; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.car.CarDeviceProvisionedController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NavigationBarController;

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

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

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -72,8 +71,6 @@ public class CarNavigationBarTest extends SysuiTestCase { 
    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private NavigationBarController mNavigationBarController;

    @Mock

    private ButtonSelectionStateController mButtonSelectionStateController;

    @Mock

    private PhoneStatusBarPolicy mIconPolicy;
@@ -88,8 +85,8 @@ public class CarNavigationBarTest extends SysuiTestCase { 
        mCarNavigationBar = new CarNavigationBar(mContext, mTestableResources.getResources(),

                mCarNavigationBarController, mWindowManager, mDeviceProvisionedController,

                new CommandQueue(mContext), mAutoHideController, mButtonSelectionStateListener,

                mHandler, () -> mKeyguardStateController, () -> mNavigationBarController,

                mButtonSelectionStateController, mIconPolicy, mIconController);

                mHandler, () -> mKeyguardStateController, mButtonSelectionStateController,

                mIconPolicy, mIconController);

    }



    @Test