From 113538a18d6c830360efc4109ecb55b65ec50402 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 7 Jun 2016 15:35:19 -0700
Subject: [PATCH] Bring back the custom wallpaper picker [2/5]

Change-Id: Iffd0911c0e37a3c27d598f22288b68a682b40154
TICKET: OSS-62
---
 Android.mk                              | 1 -
 AndroidManifest.xml                     | 6 ++++--
 src/com/android/launcher3/Launcher.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Android.mk b/Android.mk
index 3b21fb9363..38edafaea5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 LOCAL_STATIC_JAVA_AAR_LIBRARIES := ambientsdk
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
-    $(call all-java-files-under, WallpaperPicker/src) \
     $(call all-proto-files-under, protos)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8dbabf28fd..3261d43b7d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -142,7 +142,8 @@
             android:label="@string/pick_wallpaper"
             android:icon="@mipmap/ic_launcher_wallpaper"
             android:finishOnCloseSystemDialogs="true"
-            android:process=":wallpaper_chooser">
+            android:process=":wallpaper_chooser"
+            android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -155,7 +156,8 @@
             android:label="@string/crop_wallpaper"
             android:icon="@mipmap/ic_launcher_wallpaper"
             android:finishOnCloseSystemDialogs="true"
-            android:process=":wallpaper_chooser">
+            android:process=":wallpaper_chooser"
+            android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.wallpaper.CROP_AND_SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 2eb442ba28..dc115a37de 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3176,7 +3176,7 @@ protected void onClickAddWidgetButton(View view) {
      */
     protected void onClickWallpaperPicker(View v) {
         if (LOGD) Log.d(TAG, "onClickWallpaperPicker");
-        startActivityForResult(new Intent(Intent.ACTION_SET_WALLPAPER).setPackage(getPackageName()),
+        startActivityForResult(new Intent(Intent.ACTION_SET_WALLPAPER),
                 REQUEST_PICK_WALLPAPER);
 
         if (mLauncherCallbacks != null) {