Merge "Remove ALPHA_INDEX_IME_BUTTON_NAV" into tm-qpr-dev (d9dd02b4) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -486,13 +486,6 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		return (mState & FLAG_IME_VISIBLE) != 0;
		}

		/**
		* Returns true if IME switcher is visible
		*/
		public boolean isImeSwitcherVisible() {
		return (mState & FLAG_SWITCHER_SHOWING) != 0;
		}

		/**
		* Returns true if the home button is disabled
		*/

+0 −2

Original line number	Diff line number	Diff line
		@@ -557,8 +557,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		fromInit);
		mControllers.taskbarViewController.setImeIsVisible(
		mControllers.navbarButtonsViewController.isImeVisible());
		mControllers.taskbarViewController.setIsImeSwitcherVisible(
		mControllers.navbarButtonsViewController.isImeSwitcherVisible());
		int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED
		\| SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
		onNotificationShadeExpandChanged((systemUiStateFlags & shadeExpandedFlags) != 0, fromInit);

+2 −11

Original line number	Diff line number	Diff line
		@@ -79,9 +79,8 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		public static final int ALPHA_INDEX_RECENTS_DISABLED = 3;
		public static final int ALPHA_INDEX_NOTIFICATION_EXPANDED = 4;
		public static final int ALPHA_INDEX_ASSISTANT_INVOKED = 5;
		public static final int ALPHA_INDEX_IME_BUTTON_NAV = 6;
		public static final int ALPHA_INDEX_SMALL_SCREEN = 7;
		private static final int NUM_ALPHA_CHANNELS = 8;
		public static final int ALPHA_INDEX_SMALL_SCREEN = 6;
		private static final int NUM_ALPHA_CHANNELS = 7;

		private final TaskbarActivityContext mActivity;
		private final TaskbarView mTaskbarView;
		@@ -200,14 +199,6 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
		\|\| DisplayController.isTransientTaskbar(mActivity));
		}

		/**
		* Should be called when the IME switcher visibility changes.
		*/
		public void setIsImeSwitcherVisible(boolean isImeSwitcherVisible) {
		mTaskbarIconAlpha.get(ALPHA_INDEX_IME_BUTTON_NAV).setValue(
		isImeSwitcherVisible ? 0 : 1);
		}

		/**
		* Should be called when the recents button is disabled, so we can hide taskbar icons as well.
		*/