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

Commit a4cad0b9 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] 1/2: Rename NavBarController to NavBarControllerImpl. 

The next CL will add an interface named NavBarController so that we can
provide a real implementation for SysUI and an empty implementation for
Arc. This CL just renames the implementation to preserve git history.

Bug: 277764509
Test: compiles
Change-Id: I25344d9a483d50d7974583823b9a3be8eceb9982
parent 250f6f1a

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.dagger.qualifiers.UiBackground;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarControllerImpl;

import com.android.systemui.navigationbar.NavigationBarView;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -65,7 +65,7 @@ public class KeyguardDisplayManager { 
    private MediaRouter mMediaRouter = null;

    private final DisplayManager mDisplayService;

    private final DisplayTracker mDisplayTracker;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final Lazy<NavigationBarControllerImpl> mNavigationBarControllerLazy;

    private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;

    private final ConnectedDisplayKeyguardPresentation.Factory

            mConnectedDisplayKeyguardPresentationFactory;
@@ -105,7 +105,7 @@ public class KeyguardDisplayManager { 


    @Inject

    public KeyguardDisplayManager(Context context,

            Lazy<NavigationBarController> navigationBarControllerLazy,

            Lazy<NavigationBarControllerImpl> navigationBarControllerLazy,

            KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,

            DisplayTracker displayTracker,

            @Main Executor mainExecutor,

packages/SystemUI/src/com/android/systemui/Dependency.java

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import com.android.systemui.keyguard.ScreenLifecycle; 
import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarControllerImpl;

import com.android.systemui.navigationbar.NavigationModeController;

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

import com.android.systemui.plugins.ActivityStarter;
@@ -294,7 +294,7 @@ public class Dependency { 
    @Inject Lazy<ShadeController> mShadeController;

    @Inject Lazy<NotificationRemoteInputManager.Callback> mNotificationRemoteInputManagerCallback;

    @Inject Lazy<AppOpsController> mAppOpsController;

    @Inject Lazy<NavigationBarController> mNavigationBarController;

    @Inject Lazy<NavigationBarControllerImpl> mNavigationBarController;

    @Inject Lazy<AccessibilityFloatingMenuController> mAccessibilityFloatingMenuController;

    @Inject Lazy<StatusBarStateController> mStatusBarStateController;

    @Inject Lazy<NotificationLockscreenUserManager> mNotificationLockscreenUserManager;
@@ -489,7 +489,7 @@ public class Dependency { 


        mProviders.put(AppOpsController.class, mAppOpsController::get);



        mProviders.put(NavigationBarController.class, mNavigationBarController::get);

        mProviders.put(NavigationBarControllerImpl.class, mNavigationBarController::get);



        mProviders.put(AccessibilityFloatingMenuController.class,

                mAccessibilityFloatingMenuController::get);

packages/SystemUI/src/com/android/systemui/assist/ui/InvocationLightsView.java

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.view.View; 
import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarControllerImpl;

import com.android.systemui.navigationbar.NavigationBar;

import com.android.systemui.navigationbar.NavigationBarTransitions;
@@ -279,7 +279,7 @@ public class InvocationLightsView extends View 


    private void attemptRegisterNavBarListener() {

        if (!mRegistered) {

            NavigationBarController controller = Dependency.get(NavigationBarController.class);

            NavigationBarControllerImpl controller = Dependency.get(NavigationBarControllerImpl.class);

            if (controller == null) {

                return;

            }
@@ -296,7 +296,7 @@ public class InvocationLightsView extends View 


    private void attemptUnregisterNavBarListener() {

        if (mRegistered) {

            NavigationBarController controller = Dependency.get(NavigationBarController.class);

            NavigationBarControllerImpl controller = Dependency.get(NavigationBarControllerImpl.class);

            if (controller == null) {

                return;

            }

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

+3 −3
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ import javax.inject.Inject; 


/** A controller to handle navigation bars. */

@SysUISingleton

public class NavigationBarController implements

public class NavigationBarControllerImpl implements

        ConfigurationController.ConfigurationListener,

        NavigationModeController.ModeChangedListener,

        Dumpable {



    private static final String TAG = NavigationBarController.class.getSimpleName();

    private static final String TAG = NavigationBarControllerImpl.class.getSimpleName();



    private final Context mContext;

    private final Handler mHandler;
@@ -101,7 +101,7 @@ public class NavigationBarController implements 
                    | ActivityInfo.CONFIG_UI_MODE);



    @Inject

    public NavigationBarController(Context context,

    public NavigationBarControllerImpl(Context context,

            OverviewProxyService overviewProxyService,

            NavigationModeController navigationModeController,

            SysUiState sysUiFlagsContainer,

packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.view.Surface; 


import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarControllerImpl;

import com.android.systemui.navigationbar.NavigationBarView;



import javax.inject.Inject;
@@ -61,7 +61,7 @@ public class DeadZone { 
        }

    };



    private final NavigationBarController mNavBarController;

    private final NavigationBarControllerImpl mNavBarController;

    private final NavigationBarView mNavigationBarView;



    private boolean mShouldFlash;
@@ -87,7 +87,7 @@ public class DeadZone { 
    @Inject

    public DeadZone(NavigationBarView view) {

        mNavigationBarView = view;

        mNavBarController = Dependency.get(NavigationBarController.class);

        mNavBarController = Dependency.get(NavigationBarControllerImpl.class);

        mDisplayId = view.getContext().getDisplayId();

        onConfigurationChanged(HORIZONTAL);

    }