am 72aff731: (-s ours) am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
* commit '72aff731f0640ac6293b1ba73b6e4a5c37a2f864':
Remove dependency on support library. DO NOT MERGE.
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;
diff --git a/src/com/android/launcher2/RocketLauncher.java b/src/com/android/launcher2/RocketLauncher.java
index 1255374..505ac4c 100644
--- a/src/com/android/launcher2/RocketLauncher.java
+++ b/src/com/android/launcher2/RocketLauncher.java
@@ -23,7 +23,6 @@
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.TimeAnimator;
-import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -31,6 +30,7 @@
import android.graphics.Point;
import android.graphics.Rect;
import android.os.Handler;
+import android.support.v13.dreams.BasicDream;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.view.MotionEvent;
@@ -44,7 +44,7 @@
import java.util.HashMap;
import java.util.Random;
-public class RocketLauncher extends Activity {
+public class RocketLauncher extends BasicDream {
public static final boolean ROCKET_LAUNCHER = true;
public static class Board extends FrameLayout