PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
This commit is contained in:
The Android Open Source Project
2010-06-14 11:08:28 -07:00
parent 00c406364e 3ba01ea0d1
commit b817cb6e39
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/quicklaunch/QuickLaunchSettings.java
View File

@@ -204,7 +204,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
return true; 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 // Open the clear shortcut dialog
Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position); Preference pref = (Preference) getPreferenceScreen().getRootAdapter().getItem(position);
@@ -314,7 +314,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
String intentUri = c.getString(intentColumn); String intentUri = c.getString(intentColumn);
PackageManager packageManager = getPackageManager(); PackageManager packageManager = getPackageManager();
try { try {
Intent intent = Intent.getIntent(intentUri); Intent intent = Intent.parseUri(intentUri, 0);
ResolveInfo info = packageManager.resolveActivity(intent, 0); ResolveInfo info = packageManager.resolveActivity(intent, 0);
if (info != null) { if (info != null) {
title = info.loadLabel(packageManager); title = info.loadLabel(packageManager);