diff options
author | Winson Chung <winsonc@google.com> | 2011-05-24 15:07:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-24 15:07:34 -0700 |
commit | 169c20a5e561ece53afdfde12add9516f0bf68f3 (patch) | |
tree | d8151b43ea725caff025f9200ebc47c6788132e5 /src | |
parent | 60c787a3017714ecb176c4ccc920f036b509cf53 (diff) | |
parent | 34efdaf24d4da2c1429e1a244d101d686b951080 (diff) | |
download | android_packages_apps_Trebuchet-169c20a5e561ece53afdfde12add9516f0bf68f3.tar.gz android_packages_apps_Trebuchet-169c20a5e561ece53afdfde12add9516f0bf68f3.tar.bz2 android_packages_apps_Trebuchet-169c20a5e561ece53afdfde12add9516f0bf68f3.zip |
Merge "Prioritizing Wallpapers and Live Wallpapers."
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index fabd9e40b..4500744a1 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -18,6 +18,7 @@ package com.android.launcher2; import java.util.ArrayList; import java.util.Collections; +import java.util.Iterator; import java.util.List; import org.xmlpull.v1.XmlPullParser; @@ -167,6 +168,22 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen setDragSlopeThreshold(r.getInteger(R.integer.config_appsCustomizeDragSlopeThreshold)/100f); } + /** Removes and returns the ResolveInfo with the specified ComponentName */ + private ResolveInfo removeResolveInfoWithComponentName(List<ResolveInfo> list, + ComponentName cn) { + Iterator<ResolveInfo> iter = list.iterator(); + while (iter.hasNext()) { + ResolveInfo rinfo = iter.next(); + ActivityInfo info = rinfo.activityInfo; + ComponentName c = new ComponentName(info.packageName, info.name); + if (c.equals(cn)) { + iter.remove(); + return rinfo; + } + } + return null; + } + public void onPackagesUpdated() { // Get the list of widgets and shortcuts mWidgets.clear(); @@ -182,6 +199,20 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen PackageManager.GET_META_DATA); Collections.sort(mWallpapers, new LauncherModel.ShortcutNameComparator(mPackageManager)); + // Move Live Wallpapers to the front of the list + Context c = getContext(); + ResolveInfo liveWallpapers = removeResolveInfoWithComponentName(mWallpapers, + new ComponentName(c.getString(R.string.live_wallpaper_picker_package_name), + c.getString(R.string.live_wallpaper_picker_class_name))); + if (liveWallpapers != null) { + mWallpapers.add(0, liveWallpapers); + } + // Move Wallpapers to the front of the list + ResolveInfo wallpapers = removeResolveInfoWithComponentName(mWallpapers, + new ComponentName(c.getPackageName(), WallpaperChooser.class.getName())); + if (wallpapers != null) { + mWallpapers.add(0, wallpapers); + } } /** |