[CS] 2/2: Define interface for NavigationBarController.
As we replace CentralSurfaces references with NavigationBarController
references instead, we need to allow other variants (specifically Arc)
to be able to provide an empty NavigationBarController instance (since
those variants do not have a CentralSurfaces instance.)
Bug: 277764509
Test: smoke test of nav bar
Change-Id: Ieb0f3f554bef7fb72523381285e0a373ccf13559
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
index c7b7bdf..1c5a575 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java
@@ -45,7 +45,7 @@
import com.android.systemui.dagger.qualifiers.UiBackground;
import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.settings.DisplayTracker;
import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -65,7 +65,7 @@
private MediaRouter mMediaRouter = null;
private final DisplayManager mDisplayService;
private final DisplayTracker mDisplayTracker;
- private final Lazy<NavigationBarControllerImpl> mNavigationBarControllerLazy;
+ private final Lazy<NavigationBarController> mNavigationBarControllerLazy;
private final KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
private final ConnectedDisplayKeyguardPresentation.Factory
mConnectedDisplayKeyguardPresentationFactory;
@@ -105,7 +105,7 @@
@Inject
public KeyguardDisplayManager(Context context,
- Lazy<NavigationBarControllerImpl> navigationBarControllerLazy,
+ Lazy<NavigationBarController> navigationBarControllerLazy,
KeyguardStatusViewComponent.Factory keyguardStatusViewComponentFactory,
DisplayTracker displayTracker,
@Main Executor mainExecutor,
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index e05183f..0180384 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -53,7 +53,7 @@
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.media.dialog.MediaOutputDialogFactory;
import com.android.systemui.model.SysUiState;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;
import com.android.systemui.plugins.ActivityStarter;
@@ -294,7 +294,7 @@
@Inject Lazy<ShadeController> mShadeController;
@Inject Lazy<NotificationRemoteInputManager.Callback> mNotificationRemoteInputManagerCallback;
@Inject Lazy<AppOpsController> mAppOpsController;
- @Inject Lazy<NavigationBarControllerImpl> mNavigationBarController;
+ @Inject Lazy<NavigationBarController> mNavigationBarController;
@Inject Lazy<AccessibilityFloatingMenuController> mAccessibilityFloatingMenuController;
@Inject Lazy<StatusBarStateController> mStatusBarStateController;
@Inject Lazy<NotificationLockscreenUserManager> mNotificationLockscreenUserManager;
@@ -489,7 +489,7 @@
mProviders.put(AppOpsController.class, mAppOpsController::get);
- mProviders.put(NavigationBarControllerImpl.class, mNavigationBarController::get);
+ mProviders.put(NavigationBarController.class, mNavigationBarController::get);
mProviders.put(AccessibilityFloatingMenuController.class,
mAccessibilityFloatingMenuController::get);
diff --git a/packages/SystemUI/src/com/android/systemui/assist/ui/InvocationLightsView.java b/packages/SystemUI/src/com/android/systemui/assist/ui/InvocationLightsView.java
index 5043d8e..ac39ed5 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/ui/InvocationLightsView.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/ui/InvocationLightsView.java
@@ -33,7 +33,7 @@
import com.android.settingslib.Utils;
import com.android.systemui.Dependency;
import com.android.systemui.R;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBar;
import com.android.systemui.navigationbar.NavigationBarTransitions;
@@ -279,7 +279,7 @@
private void attemptRegisterNavBarListener() {
if (!mRegistered) {
- NavigationBarControllerImpl controller = Dependency.get(NavigationBarControllerImpl.class);
+ NavigationBarController controller = Dependency.get(NavigationBarController.class);
if (controller == null) {
return;
}
@@ -296,7 +296,7 @@
private void attemptUnregisterNavBarListener() {
if (mRegistered) {
- NavigationBarControllerImpl controller = Dependency.get(NavigationBarControllerImpl.class);
+ NavigationBarController controller = Dependency.get(NavigationBarController.class);
if (controller == null) {
return;
}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java
index 7b58b1f..9e5fd55 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java
@@ -31,6 +31,7 @@
import com.android.systemui.dock.DockManagerImpl;
import com.android.systemui.doze.DozeHost;
import com.android.systemui.media.dagger.MediaModule;
+import com.android.systemui.navigationbar.NavigationBarControllerModule;
import com.android.systemui.navigationbar.gestural.GestureModule;
import com.android.systemui.plugins.qs.QSFactory;
import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -101,6 +102,7 @@
GestureModule.class,
MediaModule.class,
MultiUserUtilsModule.class,
+ NavigationBarControllerModule.class,
PowerModule.class,
QSModule.class,
ReferenceScreenshotModule.class,
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
new file mode 100644
index 0000000..a601d7f
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.navigationbar;
+
+import androidx.annotation.Nullable;
+
+import com.android.internal.statusbar.RegisterStatusBarResult;
+import com.android.systemui.statusbar.phone.BarTransitions;
+
+/** A controller to handle navigation bars. */
+public interface NavigationBarController {
+ /**
+ * Creates navigation bars when car/status bar initializes.
+ * <p>
+ * TODO(b/117478341): I use {@code includeDefaultDisplay} to make this method compatible to
+ * CarStatusBar because they have their own nav bar. Think about a better way for it.
+ *
+ * @param includeDefaultDisplay {@code true} to create navigation bar on default display.
+ */
+ void createNavigationBars(
+ boolean includeDefaultDisplay,
+ RegisterStatusBarResult result);
+
+ /** Removes the navigation bar for the given display ID. */
+ void removeNavigationBar(int displayId);
+
+ /** @see NavigationBar#checkNavBarModes() */
+ void checkNavBarModes(int displayId);
+
+ /** @see NavigationBar#finishBarAnimations() */
+ void finishBarAnimations(int displayId);
+
+ /** @see NavigationBar#touchAutoDim() */
+ void touchAutoDim(int displayId);
+
+ /** @see NavigationBar#transitionTo(int, boolean) */
+ void transitionTo(int displayId, @BarTransitions.TransitionMode int barMode, boolean animate);
+
+ /** @see NavigationBar#disableAnimationsDuringHide(long) */
+ void disableAnimationsDuringHide(int displayId, long delay);
+
+ /** @return {@link NavigationBarView} on the default display. */
+ @Nullable
+ NavigationBarView getDefaultNavigationBarView();
+
+ /**
+ * @param displayId the ID of display which Navigation bar is on
+ * @return {@link NavigationBarView} on the display with {@code displayId}.
+ * {@code null} if no navigation bar on that display.
+ */
+ @Nullable
+ NavigationBarView getNavigationBarView(int displayId);
+
+ boolean isOverviewEnabled(int displayId);
+
+ /** @return {@link NavigationBar} on the default display. */
+ @Nullable
+ NavigationBar getDefaultNavigationBar();
+}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt
new file mode 100644
index 0000000..e73b078
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerEmptyImpl.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.navigationbar
+
+import com.android.internal.statusbar.RegisterStatusBarResult
+import com.android.systemui.dagger.SysUISingleton
+import com.android.systemui.statusbar.phone.BarTransitions
+import javax.inject.Inject
+
+/** A no-op version of [NavigationBarController] for variants like Arc and TV. */
+@SysUISingleton
+class NavigationBarControllerEmptyImpl @Inject constructor() : NavigationBarController {
+ override fun createNavigationBars(
+ includeDefaultDisplay: Boolean,
+ result: RegisterStatusBarResult?,
+ ) {}
+ override fun removeNavigationBar(displayId: Int) {}
+ override fun checkNavBarModes(displayId: Int) {}
+ override fun finishBarAnimations(displayId: Int) {}
+ override fun touchAutoDim(displayId: Int) {}
+ override fun transitionTo(
+ displayId: Int,
+ @BarTransitions.TransitionMode barMode: Int,
+ animate: Boolean,
+ ) {}
+ override fun disableAnimationsDuringHide(displayId: Int, delay: Long) {}
+ override fun getDefaultNavigationBarView(): NavigationBarView? = null
+ override fun getNavigationBarView(displayId: Int): NavigationBarView? = null
+ override fun isOverviewEnabled(displayId: Int) = false
+ override fun getDefaultNavigationBar(): NavigationBar? = null
+}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
index b6e4d4a..564e984 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java
@@ -70,12 +70,11 @@
import javax.inject.Inject;
-/** A controller to handle navigation bars. */
@SysUISingleton
public class NavigationBarControllerImpl implements
ConfigurationController.ConfigurationListener,
NavigationModeController.ModeChangedListener,
- Dumpable {
+ Dumpable, NavigationBarController {
private static final String TAG = NavigationBarControllerImpl.class.getSimpleName();
@@ -328,13 +327,7 @@
createNavigationBar(mDisplayManager.getDisplay(displayId), savedState, null /* result */);
}
- // TODO(b/117478341): I use {@code includeDefaultDisplay} to make this method compatible to
- // CarStatusBar because they have their own nav bar. Think about a better way for it.
- /**
- * Creates navigation bars when car/status bar initializes.
- *
- * @param includeDefaultDisplay {@code true} to create navigation bar on default display.
- */
+ @Override
public void createNavigationBars(final boolean includeDefaultDisplay,
RegisterStatusBarResult result) {
updateAccessibilityButtonModeIfNeeded();
@@ -358,7 +351,8 @@
* @param display the display to add navigation bar on.
*/
@VisibleForTesting
- void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) {
+ void createNavigationBar(Display display, Bundle savedState,
+ RegisterStatusBarResult result) {
if (display == null) {
return;
}
@@ -402,7 +396,8 @@
});
}
- void removeNavigationBar(int displayId) {
+ @Override
+ public void removeNavigationBar(int displayId) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
navBar.destroyView();
@@ -410,7 +405,7 @@
}
}
- /** @see NavigationBar#checkNavBarModes() */
+ @Override
public void checkNavBarModes(int displayId) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
@@ -418,7 +413,7 @@
}
}
- /** @see NavigationBar#finishBarAnimations() */
+ @Override
public void finishBarAnimations(int displayId) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
@@ -426,7 +421,7 @@
}
}
- /** @see NavigationBar#touchAutoDim() */
+ @Override
public void touchAutoDim(int displayId) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
@@ -434,7 +429,7 @@
}
}
- /** @see NavigationBar#transitionTo(int, boolean) */
+ @Override
public void transitionTo(int displayId, @TransitionMode int barMode, boolean animate) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
@@ -442,7 +437,7 @@
}
}
- /** @see NavigationBar#disableAnimationsDuringHide(long) */
+ @Override
public void disableAnimationsDuringHide(int displayId, long delay) {
NavigationBar navBar = mNavigationBars.get(displayId);
if (navBar != null) {
@@ -450,16 +445,12 @@
}
}
- /** @return {@link NavigationBarView} on the default display. */
+ @Override
public @Nullable NavigationBarView getDefaultNavigationBarView() {
return getNavigationBarView(mDisplayTracker.getDefaultDisplayId());
}
- /**
- * @param displayId the ID of display which Navigation bar is on
- * @return {@link NavigationBarView} on the display with {@code displayId}.
- * {@code null} if no navigation bar on that display.
- */
+ @Override
public @Nullable NavigationBarView getNavigationBarView(int displayId) {
NavigationBar navBar = getNavigationBar(displayId);
return (navBar == null) ? null : navBar.getView();
@@ -469,6 +460,7 @@
return mNavigationBars.get(displayId);
}
+ @Override
public boolean isOverviewEnabled(int displayId) {
final NavigationBarView navBarView = getNavigationBarView(displayId);
if (navBarView != null) {
@@ -478,7 +470,7 @@
}
}
- /** @return {@link NavigationBar} on the default display. */
+ @Override
@Nullable
public NavigationBar getDefaultNavigationBar() {
return mNavigationBars.get(mDisplayTracker.getDefaultDisplayId());
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerModule.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerModule.kt
new file mode 100644
index 0000000..448f280
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerModule.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.navigationbar
+
+import dagger.Binds
+import dagger.Module
+
+/** A module providing an instance of [NavigationBarController]. */
+@Module
+abstract class NavigationBarControllerModule {
+ @Binds
+ abstract fun navigationBarController(impl: NavigationBarControllerImpl): NavigationBarController
+}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NoopNavigationBarControllerModule.kt b/packages/SystemUI/src/com/android/systemui/navigationbar/NoopNavigationBarControllerModule.kt
new file mode 100644
index 0000000..b59912a
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NoopNavigationBarControllerModule.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.navigationbar
+
+import dagger.Binds
+import dagger.Module
+
+/** A module providing a no-op instance of [NavigationBarController]. */
+@Module
+abstract class NoopNavigationBarControllerModule {
+ @Binds
+ abstract fun navigationBarController(
+ impl: NavigationBarControllerEmptyImpl
+ ): NavigationBarController
+}
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
index bb22b28..9305d05 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/DeadZone.java
@@ -27,7 +27,7 @@
import com.android.systemui.Dependency;
import com.android.systemui.R;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import javax.inject.Inject;
@@ -61,7 +61,7 @@
}
};
- private final NavigationBarControllerImpl mNavBarController;
+ private final NavigationBarController mNavBarController;
private final NavigationBarView mNavigationBarView;
private boolean mShouldFlash;
@@ -87,7 +87,7 @@
@Inject
public DeadZone(NavigationBarView view) {
mNavigationBarView = view;
- mNavBarController = Dependency.get(NavigationBarControllerImpl.class);
+ mNavBarController = Dependency.get(NavigationBarController.class);
mDisplayId = view.getContext().getDisplayId();
onConfigurationChanged(HORIZONTAL);
}
diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
index ae97adc..cef52e7 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java
@@ -89,7 +89,7 @@
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.model.SysUiState;
import com.android.systemui.navigationbar.NavigationBar;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.navigationbar.buttons.KeyButtonView;
@@ -150,7 +150,7 @@
private final Lazy<ShadeViewController> mShadeViewControllerLazy;
private SysUiState mSysUiState;
private final Handler mHandler;
- private final Lazy<NavigationBarControllerImpl> mNavBarControllerLazy;
+ private final Lazy<NavigationBarController> mNavBarControllerLazy;
private final ScreenPinningRequest mScreenPinningRequest;
private final NotificationShadeWindowController mStatusBarWinController;
private final Provider<SceneInteractor> mSceneInteractor;
@@ -568,7 +568,7 @@
@Main Executor mainExecutor,
CommandQueue commandQueue,
ShellInterface shellInterface,
- Lazy<NavigationBarControllerImpl> navBarControllerLazy,
+ Lazy<NavigationBarController> navBarControllerLazy,
Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,
Lazy<ShadeViewController> shadeViewControllerLazy,
ScreenPinningRequest screenPinningRequest,
diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
index ef7abd4..afbe2ce 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
@@ -154,7 +154,7 @@
import com.android.systemui.media.controls.ui.KeyguardMediaController;
import com.android.systemui.media.controls.ui.MediaHierarchyManager;
import com.android.systemui.model.SysUiState;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.plugins.ActivityStarter;
@@ -499,7 +499,7 @@
private int mCurrentPanelState = STATE_CLOSED;
private final SysUiState mSysUiState;
private final NotificationShadeDepthController mDepthController;
- private final NavigationBarControllerImpl mNavigationBarController;
+ private final NavigationBarController mNavigationBarController;
private final int mDisplayId;
private final KeyguardIndicationController mKeyguardIndicationController;
@@ -736,7 +736,7 @@
KeyguardMediaController keyguardMediaController,
TapAgainViewController tapAgainViewController,
NavigationModeController navigationModeController,
- NavigationBarControllerImpl navigationBarController,
+ NavigationBarController navigationBarController,
QuickSettingsController quickSettingsController,
FragmentService fragmentService,
IStatusBarService statusBarService,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index d2b6651..5b11b41 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -152,7 +152,7 @@
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.keyguard.ui.binder.LightRevealScrimViewBinder;
import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationBarView;
import com.android.systemui.notetask.NoteTaskController;
import com.android.systemui.plugins.ActivityStarter;
@@ -668,7 +668,7 @@
Optional<Bubbles> bubblesOptional,
Lazy<NoteTaskController> noteTaskControllerLazy,
DeviceProvisionedController deviceProvisionedController,
- NavigationBarControllerImpl navigationBarController,
+ NavigationBarController navigationBarController,
AccessibilityFloatingMenuController accessibilityFloatingMenuController,
Lazy<AssistManager> assistManagerLazy,
ConfigurationController configurationController,
@@ -3006,7 +3006,7 @@
protected KeyguardManager mKeyguardManager;
private final DeviceProvisionedController mDeviceProvisionedController;
- private final NavigationBarControllerImpl mNavigationBarController;
+ private final NavigationBarController mNavigationBarController;
private final AccessibilityFloatingMenuController mAccessibilityFloatingMenuController;
// UI-specific methods
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarDemoMode.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarDemoMode.java
index df21a68..29c1372 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarDemoMode.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarDemoMode.java
@@ -31,7 +31,7 @@
import com.android.systemui.demomode.DemoMode;
import com.android.systemui.demomode.DemoModeCommandReceiver;
import com.android.systemui.demomode.DemoModeController;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.statusbar.phone.fragment.dagger.StatusBarFragmentScope;
import com.android.systemui.statusbar.policy.Clock;
import com.android.systemui.util.ViewController;
@@ -54,7 +54,7 @@
private final View mOperatorNameView;
private final DemoModeController mDemoModeController;
private final PhoneStatusBarTransitions mPhoneStatusBarTransitions;
- private final NavigationBarControllerImpl mNavigationBarController;
+ private final NavigationBarController mNavigationBarController;
private final int mDisplayId;
@Inject
@@ -63,7 +63,7 @@
@Named(OPERATOR_NAME_VIEW) View operatorNameView,
DemoModeController demoModeController,
PhoneStatusBarTransitions phoneStatusBarTransitions,
- NavigationBarControllerImpl navigationBarController,
+ NavigationBarController navigationBarController,
@DisplayId int displayId) {
super(clockView);
mClockView = clockView;
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java
index 1022c29..438f0f4 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardDisplayManagerTest.java
@@ -40,7 +40,7 @@
import com.android.keyguard.dagger.KeyguardStatusViewComponent;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.flags.FakeFeatureFlags;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.settings.FakeDisplayTracker;
import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -58,7 +58,7 @@
public class KeyguardDisplayManagerTest extends SysuiTestCase {
@Mock
- private NavigationBarControllerImpl mNavigationBarController;
+ private NavigationBarController mNavigationBarController;
@Mock
private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
@Mock
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java
index 40f3058..3eb7329 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarButtonTest.java
@@ -81,7 +81,7 @@
mDependency.injectMockDependency(AssistManager.class);
mDependency.injectMockDependency(OverviewProxyService.class);
mDependency.injectMockDependency(KeyguardStateController.class);
- mDependency.injectMockDependency(NavigationBarControllerImpl.class);
+ mDependency.injectMockDependency(NavigationBarController.class);
mDependency.injectTestDependency(EdgeBackGestureHandler.Factory.class,
mEdgeBackGestureHandlerFactory);
mNavBar = new NavigationBarView(context, null);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarInflaterViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarInflaterViewTest.java
index 8a6bb3f..52d02b6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarInflaterViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarInflaterViewTest.java
@@ -55,7 +55,7 @@
mDependency.injectMockDependency(AssistManager.class);
mDependency.injectMockDependency(OverviewProxyService.class);
mDependency.injectMockDependency(NavigationModeController.class);
- mDependency.injectMockDependency(NavigationBarControllerImpl.class);
+ mDependency.injectMockDependency(NavigationBarController.class);
mNavBarInflaterView = spy(new NavigationBarInflaterView(mContext, null));
doNothing().when(mNavBarInflaterView).createInflaters();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
index 272fc9d..48a36cb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java
@@ -250,7 +250,7 @@
mDependency.injectTestDependency(AssistManager.class, mAssistManager);
mDependency.injectMockDependency(KeyguardStateController.class);
mDependency.injectTestDependency(StatusBarStateController.class, mStatusBarStateController);
- mDependency.injectMockDependency(NavigationBarControllerImpl.class);
+ mDependency.injectMockDependency(NavigationBarController.class);
mDependency.injectTestDependency(OverviewProxyService.class, mOverviewProxyService);
mDependency.injectTestDependency(NavigationModeController.class, mNavigationModeController);
TestableLooper.get(this).runWithLooper(() -> {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java
index ee61d8a..fb08bf5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTransitionsTest.java
@@ -73,7 +73,7 @@
mDependency.injectMockDependency(OverviewProxyService.class);
mDependency.injectMockDependency(StatusBarStateController.class);
mDependency.injectMockDependency(KeyguardStateController.class);
- mDependency.injectMockDependency(NavigationBarControllerImpl.class);
+ mDependency.injectMockDependency(NavigationBarController.class);
mDependency.injectTestDependency(EdgeBackGestureHandler.Factory.class,
mEdgeBackGestureHandlerFactory);
doReturn(mContext)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt
index bc4bf49..18fa0be 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/recents/OverviewProxyServiceTest.kt
@@ -33,7 +33,7 @@
import com.android.systemui.keyguard.KeyguardUnlockAnimationController
import com.android.systemui.keyguard.WakefulnessLifecycle
import com.android.systemui.model.SysUiState
-import com.android.systemui.navigationbar.NavigationBarControllerImpl
+import com.android.systemui.navigationbar.NavigationBarController
import com.android.systemui.navigationbar.NavigationModeController
import com.android.systemui.recents.OverviewProxyService.ACTION_QUICKSTEP
import com.android.systemui.scene.shared.flag.FakeSceneContainerFlags
@@ -93,7 +93,7 @@
// The following mocks belong to not-yet-tested parts of OverviewProxyService.
@Mock private lateinit var commandQueue: CommandQueue
@Mock private lateinit var shellInterface: ShellInterface
- @Mock private lateinit var navBarController: NavigationBarControllerImpl
+ @Mock private lateinit var navBarController: NavigationBarController
@Mock private lateinit var centralSurfaces: CentralSurfaces
@Mock private lateinit var shadeViewController: ShadeViewController
@Mock private lateinit var screenPinningRequest: ScreenPinningRequest
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
index 79e7a1c..13bf53b 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java
@@ -113,7 +113,7 @@
import com.android.systemui.media.controls.ui.KeyguardMediaController;
import com.android.systemui.media.controls.ui.MediaHierarchyManager;
import com.android.systemui.model.SysUiState;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.FalsingManager;
@@ -265,7 +265,7 @@
@Mock protected KeyguardViewConfigurator mKeyguardViewConfigurator;
@Mock protected KeyguardMediaController mKeyguardMediaController;
@Mock protected NavigationModeController mNavigationModeController;
- @Mock protected NavigationBarControllerImpl mNavigationBarController;
+ @Mock protected NavigationBarController mNavigationBarController;
@Mock protected QuickSettingsController mQsController;
@Mock protected ShadeHeaderController mShadeHeaderController;
@Mock protected ContentResolver mContentResolver;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
index 68c184e..6b944ae 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java
@@ -108,7 +108,7 @@
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.keyguard.ui.viewmodel.LightRevealScrimViewModel;
import com.android.systemui.log.LogBuffer;
-import com.android.systemui.navigationbar.NavigationBarControllerImpl;
+import com.android.systemui.navigationbar.NavigationBarController;
import com.android.systemui.notetask.NoteTaskController;
import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.plugins.ActivityStarter.OnDismissAction;
@@ -249,7 +249,7 @@
@Mock private AssistManager mAssistManager;
@Mock private NotificationGutsManager mNotificationGutsManager;
@Mock private NotificationMediaManager mNotificationMediaManager;
- @Mock private NavigationBarControllerImpl mNavigationBarController;
+ @Mock private NavigationBarController mNavigationBarController;
@Mock private AccessibilityFloatingMenuController mAccessibilityFloatingMenuController;
@Mock private SysuiColorExtractor mColorExtractor;
private WakefulnessLifecycle mWakefulnessLifecycle;