summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/xml/default_workspace_4x4.xml3
-rw-r--r--res/xml/default_workspace_5x5.xml3
-rw-r--r--res/xml/default_workspace_5x6.xml3
-rw-r--r--src/com/android/launcher3/LauncherProvider.java7
4 files changed, 6 insertions, 10 deletions
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index bee6e5f64..40172bd31 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -163,9 +163,6 @@
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
<favorite
- launcher:packageName="com.cyngn.dialer"
- launcher:className="com.android.dialer.DialtactsActivity" />
- <favorite
launcher:packageName="com.android.contacts"
launcher:className="com.android.contacts.activities.PeopleActivity" />
</resolve>
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index ea2916cf1..5f8a621d8 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -163,9 +163,6 @@
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
<favorite
- launcher:packageName="com.cyngn.dialer"
- launcher:className="com.android.dialer.DialtactsActivity" />
- <favorite
launcher:packageName="com.android.contacts"
launcher:className="com.android.contacts.activities.PeopleActivity" />
</resolve>
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index c62b207a4..da0ac163c 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -163,9 +163,6 @@
launcher:packageName="com.android.dialer"
launcher:className="com.android.dialer.DialtactsActivity" />
<favorite
- launcher:packageName="com.cyngn.dialer"
- launcher:className="com.android.dialer.DialtactsActivity" />
- <favorite
launcher:packageName="com.android.contacts"
launcher:className="com.android.contacts.activities.PeopleActivity" />
</resolve>
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index bdb5c5bf1..0273cbbfa 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -69,7 +69,7 @@ public class LauncherProvider extends ContentProvider {
private static final String TAG = "LauncherProvider";
private static final boolean LOGD = false;
- private static final int DATABASE_VERSION = 28;
+ private static final int DATABASE_VERSION = 29;
public static final String AUTHORITY = ProviderConfig.AUTHORITY;
@@ -796,6 +796,11 @@ public class LauncherProvider extends ContentProvider {
// Old version remains, which means we wipe old data
break;
}
+ }
+ case 29: {
+ migrateLauncherFavorite(db, "com.cyngn.dialer", "com.android.dialer",
+ "com.android.dialer.DialtactsActivity",
+ "com.android.dialer.DialtactsActivity");
return;
}
}