Merge changes from topic 'am-6b03419d66d24fd58cdd059bde903191' into nyc-mr1-dev-plus-aosp (6b6a3596) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/ButtonDispatcher.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -176,8 +176,18 @@ public class ButtonDispatcher {
		mCurrentView = currentView.findViewById(mId);
		}

		public void setCarMode(boolean carMode) {
		final int N = mViews.size();
		for (int i = 0; i < N; i++) {
		final View view = mViews.get(i);
		if (view instanceof ButtonInterface) {
		((ButtonInterface) view).setCarMode(carMode);
		}
		}
		}

		/**
		* Interface for ImageView button actions.
		* Interface for button actions.
		*/
		public interface ButtonInterface {
		void setImageResource(@DrawableRes int resId);
		@@ -187,5 +197,7 @@ public class ButtonDispatcher {
		void abortCurrentGesture();

		void setLandscape(boolean landscape);

		void setCarMode(boolean carMode);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -624,6 +624,7 @@ public class NavigationBarView extends LinearLayout {
		mCarMode = true;
		uiCarModeChanged = true;
		}
		getHomeButton().setCarMode(mCarMode);
		}
		return uiCarModeChanged;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,11 @@ public class KeyButtonView extends ImageView implements ButtonDispatcher.ButtonI
		public void setLandscape(boolean landscape) {
		//no op
		}

		@Override
		public void setCarMode(boolean carMode) {
		// no op
		}
		}