diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2a9bf29..d384d31 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2798,12 +2798,18 @@ public final class Settings { public static final String STATUS_BAR_IME_SWITCHER = "status_bar_ime_switcher"; /** - * Statusbar State + * Expanded desktop on/off state * @hide */ public static final String EXPANDED_DESKTOP_STATE = "expanded_desktop_state"; /** + * Expanded desktop style (with status bar or without status bar) + * @hide + */ + public static final String EXPANDED_DESKTOP_STYLE = "expanded_desktop_style"; + + /** * Whether to use a separate delay for "slide to unlock" and security * lock * @hide diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 7ff7720..dccd24d 100755..100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3473,7 +3473,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { // and mTopIsFullscreen is that that mTopIsFullscreen is set only if the window // has the FLAG_FULLSCREEN set. Not sure if there is another way that to be the // case though. - if (topIsFullscreen || Settings.System.getInt(mContext.getContentResolver(), Settings.System.EXPANDED_DESKTOP_STATE, 0) == 1) { + if (topIsFullscreen || (Settings.System.getInt(mContext.getContentResolver(), + Settings.System.EXPANDED_DESKTOP_STATE, 0) == 1 && + Settings.System.getInt(mContext.getContentResolver(), + Settings.System.EXPANDED_DESKTOP_STYLE, 0) == 2)) { if (DEBUG_LAYOUT) Log.v(TAG, "** HIDING status bar"); if (mStatusBar.hideLw(true)) { changes |= FINISH_LAYOUT_REDO_LAYOUT; |