commit | 31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a | [log] [tgz] |
---|---|---|
author | George Mount <mount@google.com> | Wed Mar 19 14:25:22 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 19 14:25:23 2014 +0000 |
tree | 9a3fff6bb9c73fc183565a13e40e486159b58853 | |
parent | 555084b3a55719e1bf33974f0a8334ee345fc3dd [diff] | |
parent | 14a9738330c14410378fe2ba1c25404a444adaf3 [diff] |
Merge "Fix ActionBar layout bug when INVISIBLE."
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index c957b67..adb9bf8 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java
@@ -286,7 +286,7 @@ topInset += mActionBarHeight; } } - } else if (mActionBarTop.getVisibility() == VISIBLE) { + } else if (mActionBarTop.getVisibility() != GONE) { // This is the space needed on top of the window for all of the action bar // and tabs. topInset = mActionBarTop.getMeasuredHeight();