summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-03-19 14:25:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-19 14:25:23 +0000
commit31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a (patch)
tree9a3fff6bb9c73fc183565a13e40e486159b58853
parent555084b3a55719e1bf33974f0a8334ee345fc3dd (diff)
parent14a9738330c14410378fe2ba1c25404a444adaf3 (diff)
downloadframeworks_base-31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a.zip
frameworks_base-31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a.tar.gz
frameworks_base-31dc8f701fb14e185bf1c1b35d68bd7d1a42a54a.tar.bz2
Merge "Fix ActionBar layout bug when INVISIBLE."
-rw-r--r--core/java/com/android/internal/widget/ActionBarOverlayLayout.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class ActionBarOverlayLayout extends ViewGroup {
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();