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

Merge "Preset type; contact shortcuts are now launched w/o provider invocation" into jb-dev

Browse Source
This commit is contained in:
Daniel Lehmann
2012-05-15 15:58:55 -07:00
committed by Android (Google) Code Review
parent f26493f5a1 d02402cb14
commit a8859a0a6b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/LauncherProvider.java
+9 -5
View File
@@ -66,7 +66,7 @@ public class LauncherProvider extends ContentProvider {
private static final String DATABASE_NAME = "launcher.db";
private static final int DATABASE_VERSION = 11;
private static final int DATABASE_VERSION = 12;
static final String AUTHORITY = "com.android.launcher2.settings";
@@ -477,14 +477,15 @@ public class LauncherProvider extends ContentProvider {
version = 9;
}
// We bumped the version twice during JB, once to update the launch flags, and once to
// update the override for the default launch animation.
if (version < 11) {
// We bumped the version three time during JB, once to update the launch flags, once to
// update the override for the default launch animation and once to set the mimetype
// to improve startup performance
if (version < 12) {
// Contact shortcuts need a different set of flags to be launched now
// The updateContactsShortcuts change is idempotent, so we can keep using it like
// back in the Donut days
updateContactsShortcuts(db);
version = 11;
version = 12;
}
if (version != DATABASE_VERSION) {
@@ -540,6 +541,9 @@ public class LauncherProvider extends ContentProvider {
newIntent.putExtra(
Launcher.INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION, true);
newIntent.setData(uri);
// Determine the type and also put that in the shortcut
// (that can speed up launch a bit)
newIntent.setDataAndType(uri, newIntent.resolveType(mContext));
final ContentValues values = new ContentValues();
values.put(LauncherSettings.Favorites.INTENT,