From b2e0235cceec2fe892a9ccd8f26d17095c6799bf Mon Sep 17 00:00:00 2001
From: Richard MacGregor <rmacgregor@cyngn.com>
Date: Mon, 18 Apr 2016 14:23:42 -0700
Subject: Trebuchet : Update default workspace for dialer

Ticket CD-544

Change-Id: I47602367254732390ff73ae4676e569b7f27b819
(cherry picked from commit 0c86fc125cd8cea0ed0f6c4827d159b56709e1cf)
---
 res/xml/default_workspace_4x4.xml               | 3 ---
 res/xml/default_workspace_5x5.xml               | 3 ---
 res/xml/default_workspace_5x6.xml               | 3 ---
 src/com/android/launcher3/LauncherProvider.java | 7 ++++++-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index d2ca38a45..fea702b05 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -162,9 +162,6 @@
         <favorite
             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" />
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 09aa09804..4445eb450 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -162,9 +162,6 @@
         <favorite
             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" />
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 558f525c0..91cdb710d 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -162,9 +162,6 @@
         <favorite
             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" />
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 8047e7c16..088863ad7 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;
                 }
             }
-- 
cgit v1.2.3