summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/WallpaperRootView.java
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-05-08 18:22:00 -0700
committerBrint E. Kriebel <bekit@cyngn.com>2014-05-08 18:22:00 -0700
commit5bd2daf53614d9d47514be7c6ac702474a523cef (patch)
treec1ddaa7e2236cb364437e9a613eacfcc32dd58fd /src/com/android/launcher3/WallpaperRootView.java
parent9ade3e01a20d6ff8d67331eed37b5c1511f586c3 (diff)
parent98adac0552dd188c2241636a2ddb7d1538f26f81 (diff)
downloadandroid_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.tar.gz
android_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.tar.bz2
android_packages_apps_Trebuchet-5bd2daf53614d9d47514be7c6ac702474a523cef.zip
Merge remote-tracking branch 'github/cm-11.0' into HEAD
Diffstat (limited to 'src/com/android/launcher3/WallpaperRootView.java')
-rw-r--r--src/com/android/launcher3/WallpaperRootView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/WallpaperRootView.java b/src/com/android/launcher3/WallpaperRootView.java
index ceaa043a7..7b0d4f147 100644
--- a/src/com/android/launcher3/WallpaperRootView.java
+++ b/src/com/android/launcher3/WallpaperRootView.java
@@ -22,14 +22,14 @@ import android.util.AttributeSet;
import android.widget.RelativeLayout;
public class WallpaperRootView extends RelativeLayout {
- private final WallpaperPickerActivity a;
+ private final WallpaperCropActivity a;
public WallpaperRootView(Context context, AttributeSet attrs) {
super(context, attrs);
- a = (WallpaperPickerActivity) context;
+ a = (WallpaperCropActivity) context;
}
public WallpaperRootView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
- a = (WallpaperPickerActivity) context;
+ a = (WallpaperCropActivity) context;
}
protected boolean fitSystemWindows(Rect insets) {