diff options
| author | d34d <clark@cyngn.com> | 2016-06-07 15:35:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-19 08:35:31 -0700 |
| commit | 113538a18d6c830360efc4109ecb55b65ec50402 (patch) | |
| tree | 9a7c48c97e82ec261a39b6422b5175f9bd9c18a7 | |
| parent | fd3ac2ad29725af2de960bf235b7c648eb7cb30a (diff) | |
| download | packages_apps_Trebuchet-113538a18d6c830360efc4109ecb55b65ec50402.tar.gz packages_apps_Trebuchet-113538a18d6c830360efc4109ecb55b65ec50402.tar.bz2 packages_apps_Trebuchet-113538a18d6c830360efc4109ecb55b65ec50402.zip | |
Bring back the custom wallpaper picker [2/5]
Change-Id: Iffd0911c0e37a3c27d598f22288b68a682b40154
TICKET: OSS-62
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 3b21fb936..38edafaea 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 8dbabf28f..3261d43b7 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 2eb442ba2..dc115a37d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3176,7 +3176,7 @@ public class Launcher extends Activity */ 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) { |