diff options
| author | 2014-10-01 15:01:37 +0000 | |
|---|---|---|
| committer | 2014-10-01 15:01:37 +0000 | |
| commit | c754382ba042ee0c70892b5ec33cd32c11e98d16 (patch) | |
| tree | 2e7bfb1e9dbe04c6b8f26e592f000faf2b80b268 | |
| parent | 8c14ff5cb1e742e7e57cc213f91cb76b9600479c (diff) | |
| parent | fe426d061ad5feb65200c2970bf826b10e356247 (diff) | |
am fe426d06: Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev
* commit 'fe426d061ad5feb65200c2970bf826b10e356247':
Inset the non-overlay contextual action bar without a status guard
| -rw-r--r-- | core/java/android/view/View.java | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 83dfe851bcd0..b454681ec1af 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6601,6 +6601,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #fitSystemWindows(Rect) * @see #setSystemUiVisibility(int) */ + @ViewDebug.ExportedProperty public boolean getFitsSystemWindows() { return (mViewFlags & FITS_SYSTEM_WINDOWS) == FITS_SYSTEM_WINDOWS; } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 42ee666ec70b..5f3b8777ec3c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -2929,6 +2929,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } } + // The action mode's theme may differ from the app, so + // always show the status guard above it if we have one. + showStatusGuard = mStatusGuard != null; + // We only need to consume the insets if the action // mode is overlaid on the app content (e.g. it's // sitting in a FrameLayout, see @@ -2936,11 +2940,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { final boolean nonOverlay = (getLocalFeatures() & (1 << FEATURE_ACTION_MODE_OVERLAY)) == 0; insets = insets.consumeSystemWindowInsets( - false, nonOverlay /* top */, false, false); - - // The action mode's theme may differ from the app, so - // always show the status guard above it. - showStatusGuard = true; + false, nonOverlay && showStatusGuard /* top */, false, false); } else { // reset top margin if (mlp.topMargin != 0) { |