Skip to content

Commit fbdff47

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Fix issue #6268190"
2 parents b76a560 + fe2b7cc commit fbdff47

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/java/com/android/internal/widget/ActionBarOverlayLayout.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ protected boolean fitSystemWindows(Rect insets) {
137137

138138
// The top and bottom action bars are always within the content area.
139139
boolean changed = applyInsets(mActionBarTop, insets, true, true, false, true);
140-
changed |= applyInsets(mActionBarBottom, insets, true, false, true, true);
140+
if (mActionBarBottom != null) {
141+
changed |= applyInsets(mActionBarBottom, insets, true, false, true, true);
142+
}
141143

142144
// If the window has not requested system UI layout flags, we need to
143145
// make sure its content is not being covered by system UI... though it

0 commit comments

Comments
 (0)