From fe2b7ccca4c5fdaa0d77968b897bd789f4c87c30 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Sat, 31 Mar 2012 19:47:09 -0700 Subject: Fix issue #6268190 Change-Id: Ib269fe34c4d3e704f4080076e173241c0761040c --- core/java/com/android/internal/widget/ActionBarOverlayLayout.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.1