diff options
author | Arne Coucheron <arco68@gmail.com> | 2017-06-29 21:23:01 +0200 |
---|---|---|
committer | Arne Coucheron <arco68@gmail.com> | 2017-07-15 06:51:06 +0200 |
commit | e6d41b33bb114840666135137da05237f908c7bc (patch) | |
tree | 263054dac4f1bdbd6f8837908aceec2ef41f858b | |
parent | 2bf589bec9487b253e2788670433119b4cc18fb8 (diff) | |
download | android_packages_apps_Trebuchet-e6d41b33bb114840666135137da05237f908c7bc.tar.gz android_packages_apps_Trebuchet-e6d41b33bb114840666135137da05237f908c7bc.tar.bz2 android_packages_apps_Trebuchet-e6d41b33bb114840666135137da05237f908c7bc.zip |
Enable custom wallpaper picker
Change-Id: Iad5638c43f38d240d87c5f5957ec7112cf1c14d7
-rw-r--r-- | res/values/config.xml | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/util/PackageManagerHelper.java | 23 |
3 files changed, 0 insertions, 32 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 94c4ab7e8..82bd3fa53 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -79,9 +79,6 @@ <!-- Name of an icon provider class. --> <string name="icon_provider_class" translatable="false"></string> - <!-- Package name of the default wallpaper picker. --> - <string name="wallpaper_picker_package" translatable="false"></string> - <!-- View ID to use for QSB widget --> <item type="id" name="qsb_widget" /> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 4672e080a..15ba43df7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2641,17 +2641,11 @@ public class Launcher extends Activity return; } - String pickerPackage = getString(R.string.wallpaper_picker_package); - if (TextUtils.isEmpty(pickerPackage)) { - pickerPackage = PackageManagerHelper.getWallpaperPickerPackage(getPackageManager()); - } - int pageScroll = mWorkspace.getScrollForPage(mWorkspace.getPageNearestToCenterOfScreen()); float offset = mWorkspace.mWallpaperOffset.wallpaperOffsetForScroll(pageScroll); setWaitingForResult(new PendingRequestArgs(new ItemInfo())); Intent intent = new Intent(Intent.ACTION_SET_WALLPAPER) - .setPackage(pickerPackage) .putExtra(Utilities.EXTRA_WALLPAPER_OFFSET, offset); intent.setSourceBounds(getViewBounds(v)); startActivityForResult(intent, REQUEST_PICK_WALLPAPER, getActivityLaunchOptions(v)); diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java index 3e15d05e1..4973d4ddd 100644 --- a/src/com/android/launcher3/util/PackageManagerHelper.java +++ b/src/com/android/launcher3/util/PackageManagerHelper.java @@ -80,29 +80,6 @@ public class PackageManagerHelper { } /** - * Returns the package for a wallpaper picker system app giving preference to a app which - * is not as image picker. - */ - public static String getWallpaperPickerPackage(PackageManager pm) { - ArrayList<String> excludePackages = new ArrayList<>(); - // Exclude packages which contain an image picker - for (ResolveInfo info : pm.queryIntentActivities( - new Intent(Intent.ACTION_GET_CONTENT).setType("image/*"), 0)) { - excludePackages.add(info.activityInfo.packageName); - } - excludePackages.add(LIVE_WALLPAPER_PICKER_PKG); - - for (ResolveInfo info : pm.queryIntentActivities( - new Intent(Intent.ACTION_SET_WALLPAPER), 0)) { - if (!excludePackages.contains(info.activityInfo.packageName) && - (info.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { - return info.activityInfo.packageName; - } - } - return excludePackages.get(0); - } - - /** * Returns true if {@param srcPackage} has the permission required to start the activity from * {@param intent}. If {@param srcPackage} is null, then the activity should not need * any permissions |