commit 90ec2f43f14f037f5962df6a02e2aa48f2f60a3b
author Eric Fischer <enf@google.com> Tue Nov 29 13:32:42 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 29 13:32:42 2011 -0800
tree 8db44374c456d8629150fe944a90808982f3fd24
parent b21dd31b6f1242b0309eee1b48966174ae35768f
parent ffd5c57b9206b755037a9e7aeea920997624ff06

am ffd5c57b: (-s ours) am 3924df85: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit 'ffd5c57b9206b755037a9e7aeea920997624ff06':
  Import revised translations.  DO NOT MERGE

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;