Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b817cb6e authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
parents 00c40636 3ba01ea0

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

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements 
        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 @@ public class QuickLaunchSettings extends PreferenceActivity implements 
            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);