commit b817cb6e398d4f1f9c3822360f325250d6152e60
author The Android Open Source Project <initial-contribution@android.com> Mon Jun 14 11:08:28 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Jun 14 11:08:28 2010 -0700
tree dedad6a748fab1b307767735fb95d1b5531b2a72
parent 00c406364e7bb6b9191e928b1d1e4be9a7bb0960
parent 3ba01ea0d1c5feeae6156d8747558676b3f1d0dc

merge from open-source master

Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79

src/com/android/settings/quicklaunch/QuickLaunchSettings.java

diff --git a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
index ca5d3ab..2d2b01c 100644
--- a/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
+++ b/src/com/android/settings/quicklaunch/QuickLaunchSettings.java
@@ -204,7 +204,7 @@
         return true;
     }
 
-    public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
         
         // Open the clear shortcut dialog
         Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position);
@@ -314,7 +314,7 @@
             String intentUri = c.getString(intentColumn);
             PackageManager packageManager = getPackageManager();
             try {
-                Intent intent = Intent.getIntent(intentUri);
+                Intent intent = Intent.parseUri(intentUri, 0);
                 ResolveInfo info = packageManager.resolveActivity(intent, 0);
                 if (info != null) {
                     title = info.loadLabel(packageManager);