diff options
| author | Flemmard <flemmard@gmail.com> | 2012-01-29 08:31:45 -0500 |
|---|---|---|
| committer | Flemmard <flemmard@gmail.com> | 2012-01-29 11:29:32 -0500 |
| commit | 702d357a7f5f3422e2501a9cd430323d4a0074e2 (patch) | |
| tree | e11a38c08e312f4c3dcc6398a9cb524fb00d5bcb /policy | |
| parent | e3a56d8ea7bea2c9e6127e835880cd49de514751 (diff) | |
| download | frameworks_base-702d357a7f5f3422e2501a9cd430323d4a0074e2.zip frameworks_base-702d357a7f5f3422e2501a9cd430323d4a0074e2.tar.gz frameworks_base-702d357a7f5f3422e2501a9cd430323d4a0074e2.tar.bz2 | |
Added CombinedBar Auto Hide (3/2) (FIX)
This fix shows the bar again when touching screen, as it does on GN.
PatchSet 2 fixes crash on some fullscreen apps.
Change-Id: I8fbbbddd551ee2c053efe1cd6e0666f932200e93
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index e61c877..0322658 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2409,7 +2409,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { public int finishAnimationLw() { int changes = 0; boolean topIsFullscreen = false; - final WindowManager.LayoutParams lp = (mTopFullscreenOpaqueWindowState != null) ? mTopFullscreenOpaqueWindowState.getAttrs() : null; @@ -2434,7 +2433,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // case though. if (topIsFullscreen) { if (mStatusBarCanHide || - (((updateSystemUiVisibilityLw() & View.SYSTEM_UI_FLAG_LOW_PROFILE) == 1) && + (((mFocusedWindow != null) && (mFocusedWindow.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LOW_PROFILE) == 1) && (Settings.System.getInt(mContext.getContentResolver(), Settings.System.COMBINED_BAR_AUTO_HIDE, 0) == 1))) { if (DEBUG_LAYOUT) Log.v(TAG, "Hiding status bar"); @@ -2449,7 +2448,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { } }}); } - } else if (DEBUG_LAYOUT) { + } + else if (((mFocusedWindow != null) && (mFocusedWindow.getSystemUiVisibility() & View.SYSTEM_UI_FLAG_LOW_PROFILE) == 0) && + (Settings.System.getInt(mContext.getContentResolver(), + Settings.System.COMBINED_BAR_AUTO_HIDE, 0) == 1)) { + if (mStatusBar.showLw(true)) changes |= FINISH_LAYOUT_REDO_LAYOUT; + } + else if (DEBUG_LAYOUT) { Log.v(TAG, "Preventing status bar from hiding by policy"); } } else { |