commit 797d8ff41429a40e616014514f047c34ef78db2c
author Winson Chung <winsonc@google.com> Thu Dec 01 11:59:10 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 01 11:59:10 2011 -0800
tree d4bac2766e50ad4b4890d776767e841a2f58d940
parent a5ca30c885e931acbf523ae611b130c8a5ef7e65
parent 2ddae9567430d441ece92b3f7bfd9f83e83519ae

am 2ddae956: am 1f73d893: Merge "Updating AllApps button asset." into ics-mr1

* commit '2ddae9567430d441ece92b3f7bfd9f83e83519ae':
  Updating AllApps button asset.

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;