Merge "Update NavigationBarOverlayController interface." into sc-dev am: 12e2b51e76 (2d44e451) · Commits · e / os / android_frameworks_base

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -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.
		@@ -71,11 +69,6 @@ public class NavigationBarOverlayController {
		*/
		public void unregisterListeners() {}

		/**
		* Set the dark intensity for all drawables.
		*/
		public void setDarkIntensity(float darkIntensity) {}

		/**
		* Return the current view.
		*/

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -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();