From 3dfb10506bfcb8bc5e53495b486fbca57ea06c78 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Tue, 14 Jan 2014 20:28:05 +0000 Subject: [PATCH] Revert "Support lights-out + bar icon dimming on low-end devices." This reverts commit 8351f348cb6ebdc2a48ad41a21db024bf96c91fa. Change-Id: I0b24fa7d978a69581e294c53bddc50053fb574b7 --- .../android/systemui/statusbar/phone/BarTransitions.java | 13 ++++++------- .../systemui/statusbar/phone/NavigationBarTransitions.java | 2 +- .../systemui/statusbar/phone/PhoneStatusBarTransitions.java | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java index db82dd04c4ba..cb17ac62439a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java @@ -37,8 +37,6 @@ 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; @@ -50,6 +48,7 @@ public class BarTransitions { private final String mTag; private final View mView; + private final boolean mSupportsTransitions = ActivityManager.isHighEndGfx(); private final BarBackgroundDrawable mBarBackground; private int mMode; @@ -58,7 +57,7 @@ public class BarTransitions { mTag = "BarTransitions." + view.getClass().getSimpleName(); mView = view; mBarBackground = new BarBackgroundDrawable(mView.getContext(), gradientResourceId); - if (HIGH_END) { + if (mSupportsTransitions) { mView.setBackground(mBarBackground); } } @@ -73,13 +72,13 @@ public class BarTransitions { mMode = mode; if (DEBUG) Log.d(mTag, String.format("%s -> %s animate=%s", modeToString(oldMode), modeToString(mode), animate)); - onTransition(oldMode, mMode, animate); + if (mSupportsTransitions) { + onTransition(oldMode, mMode, animate); + } } protected void onTransition(int oldMode, int newMode, boolean animate) { - if (HIGH_END) { - applyModeBackground(oldMode, newMode, animate); - } + applyModeBackground(oldMode, newMode, animate); } protected void applyModeBackground(int oldMode, int newMode, boolean animate) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java index 50b701f2eaa1..a74230badc75 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java @@ -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 || !HIGH_END; + final boolean isOpaque = mode == MODE_OPAQUE || mode == MODE_LIGHTS_OUT; return isOpaque ? KeyButtonView.DEFAULT_QUIESCENT_ALPHA : 1f; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java index f5abbf31c352..84065659a6dd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java @@ -68,7 +68,7 @@ public final class PhoneStatusBarTransitions extends BarTransitions { } private boolean isOpaque(int mode) { - return !(mode == MODE_SEMI_TRANSPARENT || mode == MODE_TRANSLUCENT) || !HIGH_END; + return !(mode == MODE_SEMI_TRANSPARENT || mode == MODE_TRANSLUCENT); } @Override -- 2.11.0