diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-03-31 19:47:09 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-03-31 19:47:09 -0700 |
| commit | fe2b7ccca4c5fdaa0d77968b897bd789f4c87c30 (patch) | |
| tree | 0f60ec59b68dfe7927aeda830caf7829157bcbeb /core/java/com/android/internal/widget/ActionBarOverlayLayout.java | |
| parent | 61d6c8ca49d4a3d5bf4c961878a3f71145d75058 (diff) | |
| download | frameworks_base-fe2b7ccca4c5fdaa0d77968b897bd789f4c87c30.zip frameworks_base-fe2b7ccca4c5fdaa0d77968b897bd789f4c87c30.tar.gz frameworks_base-fe2b7ccca4c5fdaa0d77968b897bd789f4c87c30.tar.bz2 | |
Fix issue #6268190
Change-Id: Ib269fe34c4d3e704f4080076e173241c0761040c
Diffstat (limited to 'core/java/com/android/internal/widget/ActionBarOverlayLayout.java')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarOverlayLayout.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index 5f36bb6..8521481 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -137,7 +137,9 @@ public class ActionBarOverlayLayout extends FrameLayout { // The top and bottom action bars are always within the content area. boolean changed = applyInsets(mActionBarTop, insets, true, true, false, true); - changed |= applyInsets(mActionBarBottom, insets, true, false, true, true); + if (mActionBarBottom != null) { + changed |= applyInsets(mActionBarBottom, insets, true, false, true, true); + } // If the window has not requested system UI layout flags, we need to // make sure its content is not being covered by system UI... though it |