Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a1240184: Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1

Browse Source 
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
  Fix issue #5433192 and maybe #5433192
This commit is contained in:
Dianne Hackborn
2011-11-30 20:50:57 -08:00
committed by Android Git Automerger
parent b7dda6d34b a1240184ef
commit f5fd08d649
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java
View File

@@ -49,6 +49,10 @@ public class CompatModeButton extends ImageView {
public void refresh() { public void refresh() {
int mode = mAM.getFrontActivityScreenCompatMode(); 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 final boolean vis = (mode != ActivityManager.COMPAT_MODE_NEVER
&& mode != ActivityManager.COMPAT_MODE_ALWAYS); && mode != ActivityManager.COMPAT_MODE_ALWAYS);
if (DEBUG) Slog.d(TAG, "compat mode is " + mode + "; icon will " + (vis ? "show" : "hide")); if (DEBUG) Slog.d(TAG, "compat mode is " + mode + "; icon will " + (vis ? "show" : "hide"));

1
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
View File

@@ -534,6 +534,7 @@ public class TabletStatusBar extends StatusBar implements
mCompatModeButton = (CompatModeButton) sb.findViewById(R.id.compatModeButton); mCompatModeButton = (CompatModeButton) sb.findViewById(R.id.compatModeButton);
mCompatModeButton.setOnClickListener(mOnClickListener); mCompatModeButton.setOnClickListener(mOnClickListener);
mCompatModeButton.setVisibility(View.GONE);
// for redirecting errant bar taps to the IME // for redirecting errant bar taps to the IME
mFakeSpaceBar = sb.findViewById(R.id.fake_space_bar); mFakeSpaceBar = sb.findViewById(R.id.fake_space_bar);

7
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -40,7 +40,6 @@ import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
@@ -72,6 +71,7 @@ import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Gravity; import android.view.Gravity;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.IApplicationToken;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.InputChannel; import android.view.InputChannel;
import android.view.InputDevice; import android.view.InputDevice;
@@ -343,6 +343,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// The last window we were told about in focusChanged. // The last window we were told about in focusChanged.
WindowState mFocusedWindow; WindowState mFocusedWindow;
IApplicationToken mFocusedApp;
private final InputHandler mPointerLocationInputHandler = new BaseInputHandler() { private final InputHandler mPointerLocationInputHandler = new BaseInputHandler() {
@Override @Override
@@ -3813,11 +3814,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
int diff = visibility ^ mLastSystemUiFlags; int diff = visibility ^ mLastSystemUiFlags;
final boolean needsMenu = (mFocusedWindow.getAttrs().flags final boolean needsMenu = (mFocusedWindow.getAttrs().flags
& WindowManager.LayoutParams.FLAG_NEEDS_MENU_KEY) != 0; & WindowManager.LayoutParams.FLAG_NEEDS_MENU_KEY) != 0;
if (diff == 0 && mLastFocusNeedsMenu == needsMenu) { if (diff == 0 && mLastFocusNeedsMenu == needsMenu
&& mFocusedApp == mFocusedWindow.getAppToken()) {
return 0; return 0;
} }
mLastSystemUiFlags = visibility; mLastSystemUiFlags = visibility;
mLastFocusNeedsMenu = needsMenu; mLastFocusNeedsMenu = needsMenu;
mFocusedApp = mFocusedWindow.getAppToken();
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
public void run() { public void run() {
if (mStatusBarService == null) { if (mStatusBarService == null) {