summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-05-16 19:27:14 (GMT)
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-05-16 19:27:14 (GMT)
commitee507b705732c7e0ea758dd82e468ba4f9841914 (patch)
tree960242988dc1065fe00777dfb115c9464ba94cb3
parent4bf0d276210dd413581ca14fecbdd3e667b44fa1 (diff)
parent3c4c81ab000ca007023e23d7ac3ce908e6a428fe (diff)
downloadandroid_packages_apps_Trebuchet-ee507b705732c7e0ea758dd82e468ba4f9841914.zip
android_packages_apps_Trebuchet-ee507b705732c7e0ea758dd82e468ba4f9841914.tar.gz
android_packages_apps_Trebuchet-ee507b705732c7e0ea758dd82e468ba4f9841914.tar.bz2
Merge "Use wallpaper picker added to WallpaperCropper apk." into cm-11.0
-rw-r--r--AndroidManifest.xml40
-rw-r--r--src/com/android/launcher3/Launcher.java7
2 files changed, 6 insertions, 41 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5194f83..ba7c8b4 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 3832048..416c806 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);
}
/**