diff options
3 files changed, 3 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarOverlayController.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarOverlayController.java index 2d0d5cd73aac..40f908b0c62f 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarOverlayController.java @@ -16,7 +16,6 @@ package com.android.systemui.navigationbar; -import android.annotation.ColorInt; import android.content.Context; import android.view.View; @@ -46,10 +45,9 @@ public class NavigationBarOverlayController { } /** - * Initialize the controller with visibility change callback and light/dark icon color. + * Initialize the controller with visibility change callback. */ - public void init(Consumer<Boolean> visibilityChangeCallback, @ColorInt int lightIconColor, - @ColorInt int darkIconColor) {} + public void init(Consumer<Boolean> visibilityChangeCallback) {} /** * Set whether the view can be shown. @@ -72,11 +70,6 @@ public class NavigationBarOverlayController { public void unregisterListeners() {} /** - * Set the dark intensity for all drawables. - */ - public void setDarkIntensity(float darkIntensity) {} - - /** * Return the current view. */ public View getCurrentView() { diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java index fbc7c92a4a64..b4f8c10f3fa6 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java @@ -198,7 +198,6 @@ public final class NavigationBarTransitions extends BarTransitions implements } mView.getRotationButtonController().setDarkIntensity(darkIntensity); - Dependency.get(NavigationBarOverlayController.class).setDarkIntensity(darkIntensity); for (DarkIntensityListener listener : mDarkIntensityListeners) { listener.onDarkIntensity(darkIntensity); } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java index f82d265d12d6..fcbd59659ae4 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java @@ -61,7 +61,6 @@ import android.view.WindowInsetsController.Behavior; import android.view.WindowManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; -import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; import com.android.internal.annotations.VisibleForTesting; @@ -326,8 +325,7 @@ public class NavigationBarView extends FrameLayout implements mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService); mNavBarOverlayController = Dependency.get(NavigationBarOverlayController.class); if (mNavBarOverlayController.isNavigationBarOverlayEnabled()) { - mNavBarOverlayController.init( - mNavbarOverlayVisibilityChangeCallback, mLightIconColor, mDarkIconColor); + mNavBarOverlayController.init(mNavbarOverlayVisibilityChangeCallback); } mConfiguration = new Configuration(); |