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

Commit 6e1fa788 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

Update NavBarController's CommandQueue callbacks to be separate. 

Moves the CommandQueue.Callback methods to be in a separate object to
make it clear what interface the methods are overriding. Child CL will
add additional override methods.

Bug: 277764509
Test: smoke test of gesture nav & 3 button nav working
Test: atest NavigationBarControllerTest
Change-Id: I7fb46a09be9c5a719679887948aa6c60aeddfe31
parent dfd500ca

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

+19 −20
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.navigationbar; 
import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_GESTURE;

import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;



import static com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler.DEBUG_MISSING_GESTURE_TAG;

import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;
@@ -58,7 +57,6 @@ import com.android.systemui.settings.DisplayTracker; 
import com.android.systemui.shared.system.QuickStepContract;

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

import com.android.systemui.statusbar.CommandQueue;

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

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

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

import com.android.systemui.statusbar.phone.LightBarController;
@@ -75,7 +73,6 @@ import javax.inject.Inject; 
/** A controller to handle navigation bars. */

@SysUISingleton

public class NavigationBarController implements

        Callbacks,

        ConfigurationController.ConfigurationListener,

        NavigationModeController.ModeChangedListener,

        Dumpable {
@@ -130,7 +127,7 @@ public class NavigationBarController implements 
        mSecureSettings = secureSettings;

        mDisplayTracker = displayTracker;

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        commandQueue.addCallback(this);

        commandQueue.addCallback(mCommandQueueCallbacks);

        configurationController.addCallback(this);

        mConfigChanges.applyNewConfig(mContext.getResources());

        mNavMode = navigationModeController.addListener(this);
@@ -270,6 +267,7 @@ public class NavigationBarController implements 
        return taskbarEnabled;

    }



    private final CommandQueue.Callbacks mCommandQueueCallbacks = new CommandQueue.Callbacks() {

        @Override

        public void onDisplayRemoved(int displayId) {

            removeNavigationBar(displayId);
@@ -289,6 +287,7 @@ public class NavigationBarController implements 
                navigationBar.setNavigationBarLumaSamplingEnabled(enable);

            }

        }

    };



    /**

     * Recreates the navigation bar for the given display.