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

Commit 11e09204 authored by Matt Casey's avatar Matt Casey
Browse files

resolve merge conflicts of 97bc1be8 to sc-v2-dev-plus-aosp 

Change-Id: I863708cc55493f91722fc1f75868071ed8a7aaef
Merged-In: I5e3587ddb0fa4bd1ef68488485d73641e0582d2f
parents 87a2f341 97bc1be8

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -235,7 +235,8 @@ public class DependencyProvider { 
            NavigationBarOverlayController navBarOverlayController,

            NavigationBarOverlayController navBarOverlayController,

            ConfigurationController configurationController,

            ConfigurationController configurationController,

            NavigationBarA11yHelper navigationBarA11yHelper,

            NavigationBarA11yHelper navigationBarA11yHelper,

            TaskbarDelegate taskbarDelegate) {

            TaskbarDelegate taskbarDelegate,

            UserTracker userTracker) {

        return new NavigationBarController(context,

        return new NavigationBarController(context,

                windowManager,

                windowManager,

                assistManagerLazy,

                assistManagerLazy,
@@ -262,7 +263,8 @@ public class DependencyProvider { 
                navBarOverlayController,

                navBarOverlayController,

                configurationController,

                configurationController,

                navigationBarA11yHelper,

                navigationBarA11yHelper,

                taskbarDelegate);

                taskbarDelegate,

                userTracker);

    }

    }





    /** */

    /** */

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+12 −5
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ import com.android.systemui.plugins.DarkIconDispatcher; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shared.recents.utilities.Utilities;

import com.android.systemui.shared.recents.utilities.Utilities;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.QuickStepContract;

import com.android.systemui.shared.system.QuickStepContract;
@@ -199,6 +200,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    private final NavigationBarOverlayController mNavbarOverlayController;

    private final NavigationBarOverlayController mNavbarOverlayController;

    private final UiEventLogger mUiEventLogger;

    private final UiEventLogger mUiEventLogger;

    private final NavigationBarA11yHelper mNavigationBarA11yHelper;

    private final NavigationBarA11yHelper mNavigationBarA11yHelper;

    private final UserTracker mUserTracker;





    private Bundle mSavedState;

    private Bundle mSavedState;

    private NavigationBarView mNavigationBarView;

    private NavigationBarView mNavigationBarView;
@@ -460,7 +462,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
            @Main Handler mainHandler,

            @Main Handler mainHandler,

            NavigationBarOverlayController navbarOverlayController,

            NavigationBarOverlayController navbarOverlayController,

            UiEventLogger uiEventLogger,

            UiEventLogger uiEventLogger,

            NavigationBarA11yHelper navigationBarA11yHelper) {

            NavigationBarA11yHelper navigationBarA11yHelper,

            UserTracker userTracker) {

        mContext = context;

        mContext = context;

        mWindowManager = windowManager;

        mWindowManager = windowManager;

        mAccessibilityManager = accessibilityManager;

        mAccessibilityManager = accessibilityManager;
@@ -485,6 +488,8 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
        mNavbarOverlayController = navbarOverlayController;

        mNavbarOverlayController = navbarOverlayController;

        mUiEventLogger = uiEventLogger;

        mUiEventLogger = uiEventLogger;

        mNavigationBarA11yHelper = navigationBarA11yHelper;

        mNavigationBarA11yHelper = navigationBarA11yHelper;

        mUserTracker = userTracker;



        mNavBarMode = mNavigationModeController.addListener(this);

        mNavBarMode = mNavigationModeController.addListener(this);

    }

    }
@@ -1375,12 +1380,14 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
                .getAssistInfoForUser(UserHandle.USER_CURRENT) != null;

                .getAssistInfoForUser(UserHandle.USER_CURRENT) != null;

        boolean longPressDefault = mContext.getResources().getBoolean(

        boolean longPressDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

                com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

        mLongPressHomeEnabled = Settings.Secure.getInt(mContentResolver,

        mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0) != 0;

                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

        boolean gestureDefault = mContext.getResources().getBoolean(

        boolean gestureDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

        mAssistantTouchGestureEnabled = Settings.Secure.getInt(mContentResolver,

        mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0) != 0;

                Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED, gestureDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

        if (mOverviewProxyService.getProxy() != null) {

        if (mOverviewProxyService.getProxy() != null) {

            try {

            try {

                mOverviewProxyService.getProxy().onAssistantAvailable(mAssistantAvailable

                mOverviewProxyService.getProxy().onAssistantAvailable(mAssistantAvailable

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.model.SysUiState; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.CommandQueue.Callbacks;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -116,6 +117,7 @@ public class NavigationBarController implements Callbacks, 
    private final TaskbarDelegate mTaskbarDelegate;

    private final TaskbarDelegate mTaskbarDelegate;

    private int mNavMode;

    private int mNavMode;

    private boolean mIsTablet;

    private boolean mIsTablet;

    private final UserTracker mUserTracker;





    /** A displayId - nav bar maps. */

    /** A displayId - nav bar maps. */

    @VisibleForTesting

    @VisibleForTesting
@@ -153,7 +155,8 @@ public class NavigationBarController implements Callbacks, 
            NavigationBarOverlayController navBarOverlayController,

            NavigationBarOverlayController navBarOverlayController,

            ConfigurationController configurationController,

            ConfigurationController configurationController,

            NavigationBarA11yHelper navigationBarA11yHelper,

            NavigationBarA11yHelper navigationBarA11yHelper,

            TaskbarDelegate taskbarDelegate) {

            TaskbarDelegate taskbarDelegate,

            UserTracker userTracker) {

        mContext = context;

        mContext = context;

        mWindowManager = windowManager;

        mWindowManager = windowManager;

        mAssistManagerLazy = assistManagerLazy;

        mAssistManagerLazy = assistManagerLazy;
@@ -189,6 +192,7 @@ public class NavigationBarController implements Callbacks, 
        mTaskbarDelegate.setOverviewProxyService(overviewProxyService,

        mTaskbarDelegate.setOverviewProxyService(overviewProxyService,

                navigationBarA11yHelper, mSysUiFlagsContainer);

                navigationBarA11yHelper, mSysUiFlagsContainer);

        mIsTablet = isTablet(mContext.getResources().getConfiguration());

        mIsTablet = isTablet(mContext.getResources().getConfiguration());

        mUserTracker = userTracker;

    }

    }





    @Override

    @Override
@@ -370,7 +374,8 @@ public class NavigationBarController implements Callbacks, 
                mHandler,

                mHandler,

                mNavBarOverlayController,

                mNavBarOverlayController,

                mUiEventLogger,

                mUiEventLogger,

                mNavigationBarA11yHelper);

                mNavigationBarA11yHelper,

                mUserTracker);

        mNavigationBars.put(displayId, navBar);

        mNavigationBars.put(displayId, navBar);





        View navigationBarView = navBar.createView(savedState);

        View navigationBarView = navBar.createView(savedState);

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarControllerTest.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.systemui.model.SysUiState; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

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

import com.android.systemui.statusbar.phone.ShadeController;
@@ -112,7 +113,8 @@ public class NavigationBarControllerTest extends SysuiTestCase { 
                        mock(NavigationBarOverlayController.class),

                        mock(NavigationBarOverlayController.class),

                        mock(ConfigurationController.class),

                        mock(ConfigurationController.class),

                        mock(NavigationBarA11yHelper.class),

                        mock(NavigationBarA11yHelper.class),

                        mock(TaskbarDelegate.class)));

                        mock(TaskbarDelegate.class),

                        mock(UserTracker.class)));

        initializeNavigationBars();

        initializeNavigationBars();

    }

    }

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

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

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.Recents;

import com.android.systemui.recents.Recents;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

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

import com.android.systemui.statusbar.phone.ShadeController;
@@ -277,7 +278,8 @@ public class NavigationBarTest extends SysuiTestCase { 
                mHandler,

                mHandler,

                mock(NavigationBarOverlayController.class),

                mock(NavigationBarOverlayController.class),

                mUiEventLogger,

                mUiEventLogger,

                mock(NavigationBarA11yHelper.class)));

                mock(NavigationBarA11yHelper.class),

                mock(UserTracker.class)));

    }

    }





    private void processAllMessages() {

    private void processAllMessages() {