diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-30 20:53:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 20:53:33 -0800 |
| commit | 4d774e0ac274e2a1c2a65a9dedfb336c95879f05 (patch) | |
| tree | 9afcf49fc0197579792abeec44c40b829833a1ec /packages/SystemUI | |
| parent | 500053f8e8e56050c9221d9020a71e6672c810f1 (diff) | |
| parent | f5fd08d64959f23ba87f4da4771ca511b05a6be0 (diff) | |
| download | frameworks_base-4d774e0ac274e2a1c2a65a9dedfb336c95879f05.zip frameworks_base-4d774e0ac274e2a1c2a65a9dedfb336c95879f05.tar.gz frameworks_base-4d774e0ac274e2a1c2a65a9dedfb336c95879f05.tar.bz2 | |
am f5fd08d6: am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1
* commit 'f5fd08d64959f23ba87f4da4771ca511b05a6be0':
Fix issue #5433192 and maybe #5433192
Diffstat (limited to 'packages/SystemUI')
| -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); |