diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-11-30 18:41:15 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2011-11-30 18:41:15 -0800 |
commit | e0f085d4b8f313179825f2b051cb403736a7d01a (patch) | |
tree | 7369f108e5ab24859c253c17ed47b59435805286 /policy | |
parent | 2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc (diff) | |
download | frameworks_base-e0f085d4b8f313179825f2b051cb403736a7d01a.zip frameworks_base-e0f085d4b8f313179825f2b051cb403736a7d01a.tar.gz frameworks_base-e0f085d4b8f313179825f2b051cb403736a7d01a.tar.bz2 |
Fix issue #5433192 and maybe #5433192
5433192: Factory reset device: compatibility screen is the first...
...screen before setup wizard
Don't show compat mode dialog if compat mode is unknown (which happens
early in boot before an activity is shown for example). Also make sure
to update status any time the current focus app token changes, so we
correctly update every time switching apps.
5651152 [Stingray] change zoom/strech setting icon won't go away
This is probably also fixed by updating when the app token changes.
Change-Id: Ibe9bd6277166230d5d96689741b78325ea099d57
Diffstat (limited to 'policy')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 0655624..4889557 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -40,7 +40,6 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; import android.os.BatteryManager; -import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -72,6 +71,7 @@ import android.util.Slog; import android.util.SparseArray; import android.view.Gravity; import android.view.HapticFeedbackConstants; +import android.view.IApplicationToken; import android.view.IWindowManager; import android.view.InputChannel; import android.view.InputDevice; @@ -343,6 +343,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // The last window we were told about in focusChanged. WindowState mFocusedWindow; + IApplicationToken mFocusedApp; private final InputHandler mPointerLocationInputHandler = new BaseInputHandler() { @Override @@ -3813,11 +3814,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { int diff = visibility ^ mLastSystemUiFlags; final boolean needsMenu = (mFocusedWindow.getAttrs().flags & WindowManager.LayoutParams.FLAG_NEEDS_MENU_KEY) != 0; - if (diff == 0 && mLastFocusNeedsMenu == needsMenu) { + if (diff == 0 && mLastFocusNeedsMenu == needsMenu + && mFocusedApp == mFocusedWindow.getAppToken()) { return 0; } mLastSystemUiFlags = visibility; mLastFocusNeedsMenu = needsMenu; + mFocusedApp = mFocusedWindow.getAppToken(); mHandler.post(new Runnable() { public void run() { if (mStatusBarService == null) { |