diff options
author | d34d <clark@cyngn.com> | 2016-06-07 15:35:19 -0700 |
---|---|---|
committer | Tom Powell <zifnab@zifnab06.net> | 2017-03-26 16:23:05 -0700 |
commit | 67de61b07cf2d48ff0c7d547e655172e90cfa1b7 (patch) | |
tree | c8482a06450387285bb23512905554b5c4f77754 | |
parent | 22ccc1f8df151d1e44d643e7e6c821106557cc97 (diff) | |
download | android_packages_apps_Trebuchet-67de61b07cf2d48ff0c7d547e655172e90cfa1b7.tar.gz android_packages_apps_Trebuchet-67de61b07cf2d48ff0c7d547e655172e90cfa1b7.tar.bz2 android_packages_apps_Trebuchet-67de61b07cf2d48ff0c7d547e655172e90cfa1b7.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 0d030dfb8..d4a497ba8 100644 --- a/Android.mk +++ b/Android.mk @@ -29,7 +29,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ org.cyanogenmod.platform.internal 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 53ced8481..6e42478b8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -138,7 +138,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" /> @@ -151,7 +152,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 84517bc13..a75b58ebe 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3127,7 +3127,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) { |