summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjrizzoli <joey@cyanogenmoditalia.it>2016-03-13 15:51:01 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-04-07 12:53:07 -0700
commitb607527a65b6f0276e2744bbb36aea9bfeae69a9 (patch)
treed5fa916b53e5e49b27eeeaebe4eadb24ecb11321
parent9c0781a49d2bdd1618228662bbef3d1822ff5c6b (diff)
downloadandroid_packages_apps_Trebuchet-b607527a65b6f0276e2744bbb36aea9bfeae69a9.zip
android_packages_apps_Trebuchet-b607527a65b6f0276e2744bbb36aea9bfeae69a9.tar.gz
android_packages_apps_Trebuchet-b607527a65b6f0276e2744bbb36aea9bfeae69a9.tar.bz2
Trebuchet: add gello to hotseat
Also migrate shortcuts from aosp browser to gello and vice versa Change-Id: I713539365b16dfc9f2ee37a7917d49f245fd5df0 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
-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.java6
4 files changed, 15 insertions, 0 deletions
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index d2ca38a..bee6e5f 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -189,6 +189,9 @@
launcher:x="2"
launcher:y="0" >
<favorite
+ launcher:packageName="org.cyanogenmod.gello.browser"
+ launcher:className="com.android.browser.BrowserActivity" />
+ <favorite
launcher:packageName="com.android.browser"
launcher:className="com.android.browser.BrowserActivity" />
<favorite
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index 09aa098..ea2916c 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -189,6 +189,9 @@
launcher:x="2"
launcher:y="0" >
<favorite
+ launcher:packageName="org.cyanogenmod.gello.browser"
+ launcher:className="com.android.browser.BrowserActivity" />
+ <favorite
launcher:packageName="com.android.browser"
launcher:className="com.android.browser.BrowserActivity" />
<favorite
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 558f525..c62b207 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -189,6 +189,9 @@
launcher:x="4"
launcher:y="0" >
<favorite
+ launcher:packageName="org.cyanogenmod.gello.browser"
+ launcher:className="com.android.browser.BrowserActivity" />
+ <favorite
launcher:packageName="com.android.browser"
launcher:className="com.android.browser.BrowserActivity" />
<favorite
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 8047e7c..05184cf 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -778,6 +778,12 @@ public class LauncherProvider extends ContentProvider {
migrateLauncherFavorite(db, "org.cyanogenmod.snap", "com.android.camera2",
"com.android.camera.CameraLauncher",
"com.android.camera.CameraLauncher");
+ migrateLauncherFavorite(db, "org.cyanogenmod.gello.browser", "com.android.browser",
+ "com.android.browser.BrowserActivity",
+ "com.android.browser.BrowserActivity");
+ migrateLauncherFavorite(db, "com.android.browser", "org.cyanogenmod.gello.browser",
+ "com.android.browser.BrowserActivity",
+ "com.android.browser.BrowserActivity");
}
case 28: {
if (!ensureSubTypeColumn(db)) {