From 3c4c81ab000ca007023e23d7ac3ce908e6a428fe Mon Sep 17 00:00:00 2001
From: Clark Scheff <clark@cyngn.com>
Date: Tue, 13 May 2014 12:50:59 -0700
Subject: Use wallpaper picker added to WallpaperCropper apk.

The code is still here for easier upstream merges.

Change-Id: I97ec1492e8acf7ff6a5ceef00a68f47e6444bf50
---
 AndroidManifest.xml                     | 40 ---------------------------------
 src/com/android/launcher3/Launcher.java |  7 +++++-
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95e6f7fb9..8599cd4a3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -117,46 +117,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="com.android.launcher3.LockWallpaperPickerActivity"
-            android:theme="@style/Theme.WallpaperCropper"
-            android:label="@string/pick_wallpaper"
-            android:icon="@mipmap/ic_launcher_wallpaper"
-            android:finishOnCloseSystemDialogs="true"
-            android:process=":wallpaper_chooser">
-            <intent-filter>
-                <action android:name="android.intent.action.SET_KEYGUARD_WALLPAPER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="com.android.launcher3.WallpaperPickerActivity"
-            android:theme="@style/Theme.WallpaperCropper"
-            android:label="@string/pick_wallpaper"
-            android:icon="@mipmap/ic_launcher_wallpaper"
-            android:finishOnCloseSystemDialogs="true"
-            android:process=":wallpaper_chooser">
-            <intent-filter>
-                <action android:name="android.intent.action.SET_WALLPAPER" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="com.android.launcher3.WallpaperCropActivity"
-            android:theme="@style/Theme.WallpaperCropper"
-            android:label="@string/crop_wallpaper"
-            android:icon="@mipmap/ic_launcher_wallpaper"
-            android:finishOnCloseSystemDialogs="true"
-            android:process=":wallpaper_chooser">
-            <intent-filter>
-                <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
-        </activity>
-
         <!-- Debugging tools -->
         <activity
             android:name="com.android.launcher3.MemoryDumpActivity"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 29618422d..551980135 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -195,6 +195,11 @@ public class Launcher extends Activity
     private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
             "com.android.launcher.toolbar_voice_search_icon";
 
+    private static final String WALLPAPER_PICKER_PACKAGE =
+            "com.android.wallpapercropper";
+    private static final String WALLPAPER_PICKER_ACTIVITY =
+            "com.android.wallpapercropper.WallpaperPickerActivity";
+
     public static final String SHOW_WEIGHT_WATCHER = "debug.show_mem";
     public static final boolean SHOW_WEIGHT_WATCHER_DEFAULT = false;
 
@@ -2322,7 +2327,7 @@ public class Launcher extends Activity
     }
 
     protected ComponentName getWallpaperPickerComponent() {
-        return new ComponentName(getPackageName(), WallpaperPickerActivity.class.getName());
+        return new ComponentName(WALLPAPER_PICKER_PACKAGE, WALLPAPER_PICKER_ACTIVITY);
     }
 
     /**
-- 
cgit v1.2.3