| commit | a55ca7d7d20c1f2d1bf5be6d2cc38ec03ac175da | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 30 12:56:15 2011 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 30 12:56:15 2011 -0800 |
| tree | 8db44374c456d8629150fe944a90808982f3fd24 | |
| parent | 90ec2f43f14f037f5962df6a02e2aa48f2f60a3b [diff] | |
| parent | 25c16b2cf556c1848bee94546f2c0530b631ca4e [diff] |
Reconcile with ics-mr1-release Change-Id: I35b4514a4521d9fb83fb9298048ffe0f7924d608
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;