summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard MacGregor <rmacgregor@cyngn.com>2016-04-18 21:23:42 (GMT)
committerRichard MacGregor <rmacgregor@cyngn.com>2016-04-26 18:17:02 (GMT)
commitb2e0235cceec2fe892a9ccd8f26d17095c6799bf (patch)
treee4b57203d77d0b5414c00e38b76254fdc97ff29f
parent8263f74d7223351740df7c9e1991b35490b6bdf0 (diff)
downloadandroid_packages_apps_Trebuchet-b2e0235cceec2fe892a9ccd8f26d17095c6799bf.zip
android_packages_apps_Trebuchet-b2e0235cceec2fe892a9ccd8f26d17095c6799bf.tar.gz
android_packages_apps_Trebuchet-b2e0235cceec2fe892a9ccd8f26d17095c6799bf.tar.bz2
Trebuchet : Update default workspace for dialer
Ticket CD-544 Change-Id: I47602367254732390ff73ae4676e569b7f27b819 (cherry picked from commit 0c86fc125cd8cea0ed0f6c4827d159b56709e1cf)
-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 d2ca38a..fea702b 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 09aa098..4445eb4 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 558f525..91cdb71 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 8047e7c..088863a 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;
@@ -784,6 +784,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;
}
}