diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-30 20:49:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-30 20:49:21 -0800 |
| commit | a1240184efd1d4391540a6e3e9cae50d56d05cb2 (patch) | |
| tree | 3bb4bb51df4f3c138832372e4312c8d183b02b42 /packages/SystemUI/src/com/android | |
| parent | b94a7fb3d7483e8b47e4f0229fc7abff10a6572d (diff) | |
| parent | e0f085d4b8f313179825f2b051cb403736a7d01a (diff) | |
| download | frameworks_base-a1240184efd1d4391540a6e3e9cae50d56d05cb2.zip frameworks_base-a1240184efd1d4391540a6e3e9cae50d56d05cb2.tar.gz frameworks_base-a1240184efd1d4391540a6e3e9cae50d56d05cb2.tar.bz2 | |
Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1
Diffstat (limited to 'packages/SystemUI/src/com/android')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java index 7fbf734..2d951c2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java @@ -49,6 +49,10 @@ public class CompatModeButton extends ImageView { public void refresh() { int mode = mAM.getFrontActivityScreenCompatMode(); + if (mode == ActivityManager.COMPAT_MODE_UNKNOWN) { + // If in an unknown state, don't change. + return; + } final boolean vis = (mode != ActivityManager.COMPAT_MODE_NEVER && mode != ActivityManager.COMPAT_MODE_ALWAYS); if (DEBUG) Slog.d(TAG, "compat mode is " + mode + "; icon will " + (vis ? "show" : "hide")); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index 01406bc..757ce0c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -534,6 +534,7 @@ public class TabletStatusBar extends StatusBar implements mCompatModeButton = (CompatModeButton) sb.findViewById(R.id.compatModeButton); mCompatModeButton.setOnClickListener(mOnClickListener); + mCompatModeButton.setVisibility(View.GONE); // for redirecting errant bar taps to the IME mFakeSpaceBar = sb.findViewById(R.id.fake_space_bar); |