diff options
author | Adam Powell <adamp@google.com> | 2014-09-30 22:22:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 22:22:01 +0000 |
commit | ad60831ed94d82d66eea494153eb85ad81171c4b (patch) | |
tree | 423a8582043425b8121466ad47f48728c9740db3 /policy | |
parent | 0be2757ad523d0902d05ac33ba989ee8df025c86 (diff) | |
parent | fe426d061ad5feb65200c2970bf826b10e356247 (diff) | |
download | frameworks_base-ad60831ed94d82d66eea494153eb85ad81171c4b.zip frameworks_base-ad60831ed94d82d66eea494153eb85ad81171c4b.tar.gz frameworks_base-ad60831ed94d82d66eea494153eb85ad81171c4b.tar.bz2 |
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
Diffstat (limited to 'policy')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 42ee666..5f3b877 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) { |