commit a5ca30c885e931acbf523ae611b130c8a5ef7e65
author Winson Chung <winsonc@google.com> Thu Dec 01 11:59:09 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 01 11:59:09 2011 -0800
tree bd7ce04d1790e651780b7b520d05f37e097827c1
parent 9aca7a0f74998bd93074fc97040c7800181344b1
parent 125bd2134eaa42bc8887317fb9dd43c3f20a3c92

am 125bd213: am 52d89c39: Merge "Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait." into ics-mr1

* commit '125bd2134eaa42bc8887317fb9dd43c3f20a3c92':
  Giving more space to the tab bar to prevent the tabs from shrinking in size in portrait.

src/com/android/launcher2/BubbleTextView.java

diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index dc498a4..01417bf 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -134,7 +134,7 @@
                 mPressedOrFocusedBackground = null;
             }
             if (isFocused()) {
-                if (mLayout == null) {
+                if (getLayout() == null) {
                     // In some cases, we get focus before we have been layed out. Set the
                     // background to null so that it will get created when the view is drawn.
                     mPressedOrFocusedBackground = null;