Merge "Support lights-out + bar icon dimming on low-end devices." (8d45cdf3) · Commits · e / os / android_frameworks_base

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ public class BarTransitions {
		private static final boolean DEBUG = false;
		private static final boolean DEBUG_COLORS = false;

		public static final boolean HIGH_END = ActivityManager.isHighEndGfx();

		public static final int MODE_OPAQUE = 0;
		public static final int MODE_SEMI_TRANSPARENT = 1;
		public static final int MODE_TRANSLUCENT = 2;
		@@ -48,7 +50,6 @@ public class BarTransitions {

		private final String mTag;
		private final View mView;
		private final boolean mSupportsTransitions = ActivityManager.isHighEndGfx();
		private final BarBackgroundDrawable mBarBackground;

		private int mMode;
		@@ -57,7 +58,7 @@ public class BarTransitions {
		mTag = "BarTransitions." + view.getClass().getSimpleName();
		mView = view;
		mBarBackground = new BarBackgroundDrawable(mView.getContext(), gradientResourceId);
		if (mSupportsTransitions) {
		if (HIGH_END) {
		mView.setBackground(mBarBackground);
		}
		}
		@@ -72,14 +73,14 @@ public class BarTransitions {
		mMode = mode;
		if (DEBUG) Log.d(mTag, String.format("%s -> %s animate=%s",
		modeToString(oldMode), modeToString(mode), animate));
		if (mSupportsTransitions) {
		onTransition(oldMode, mMode, animate);
		}
		}

		protected void onTransition(int oldMode, int newMode, boolean animate) {
		if (HIGH_END) {
		applyModeBackground(oldMode, newMode, animate);
		}
		}

		protected void applyModeBackground(int oldMode, int newMode, boolean animate) {
		if (DEBUG) Log.d(mTag, String.format("applyModeBackground oldMode=%s newMode=%s animate=%s",

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public final class NavigationBarTransitions extends BarTransitions {
		}

		private float alphaForMode(int mode) {
		final boolean isOpaque = mode == MODE_OPAQUE \|\| mode == MODE_LIGHTS_OUT;
		final boolean isOpaque = mode == MODE_OPAQUE \|\| mode == MODE_LIGHTS_OUT \|\| !HIGH_END;
		return isOpaque ? KeyButtonView.DEFAULT_QUIESCENT_ALPHA : 1f;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions {
		}

		private boolean isOpaque(int mode) {
		return !(mode == MODE_SEMI_TRANSPARENT \|\| mode == MODE_TRANSLUCENT);
		return !(mode == MODE_SEMI_TRANSPARENT \|\| mode == MODE_TRANSLUCENT) \|\| !HIGH_END;
		}

		@Override