diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-09-05 00:09:52 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-08 09:13:24 -0800 |
| commit | ba04b03e492f1ce0e42a59c0e5bc782d64fa47e8 (patch) | |
| tree | 0a412f7ecf436421de0333ce3578d8fafa849dca | |
| parent | 4fa46ac1ba0eacdc5677f444f69a9a0e6553284c (diff) | |
| download | android_packages_apps_Trebuchet-ba04b03e492f1ce0e42a59c0e5bc782d64fa47e8.tar.gz android_packages_apps_Trebuchet-ba04b03e492f1ce0e42a59c0e5bc782d64fa47e8.tar.bz2 android_packages_apps_Trebuchet-ba04b03e492f1ce0e42a59c0e5bc782d64fa47e8.zip | |
Trebuchet: Add Snap to hotseat
* Also migrate from Camera2 shortcuts, allowing to toggle
easily between the two apps
Change-Id: I98bf454d97d9afc0b9720cc7a36f7a3c7bab2c61
| -rw-r--r-- | res/xml/default_workspace_4x4.xml | 3 | ||||
| -rw-r--r-- | res/xml/default_workspace_5x5.xml | 3 | ||||
| -rw-r--r-- | res/xml/default_workspace_5x6.xml | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
4 files changed, 15 insertions, 0 deletions
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml index 38e8d8ca4..d2ca38a45 100644 --- a/res/xml/default_workspace_4x4.xml +++ b/res/xml/default_workspace_4x4.xml @@ -208,6 +208,9 @@ launcher:packageName="com.cyngn.cameranext" launcher:className="com.android.camera.CameraLauncher" /> <favorite + launcher:packageName="org.cyanogenmod.snap" + launcher:className="com.android.camera.CameraLauncher" /> + <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" /> </resolve> diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml index 231a99ba7..09aa09804 100644 --- a/res/xml/default_workspace_5x5.xml +++ b/res/xml/default_workspace_5x5.xml @@ -208,6 +208,9 @@ launcher:packageName="com.cyngn.cameranext" launcher:className="com.android.camera.CameraLauncher" /> <favorite + launcher:packageName="org.cyanogenmod.snap" + launcher:className="com.android.camera.CameraLauncher" /> + <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" /> </resolve> diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml index 95667ba6c..558f525c0 100644 --- a/res/xml/default_workspace_5x6.xml +++ b/res/xml/default_workspace_5x6.xml @@ -208,6 +208,9 @@ launcher:packageName="com.cyngn.cameranext" launcher:className="com.android.camera.CameraLauncher" /> <favorite + launcher:packageName="org.cyanogenmod.snap" + launcher:className="com.android.camera.CameraLauncher" /> + <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" /> </resolve> diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index cec346ad8..4c401866e 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -774,6 +774,12 @@ public class LauncherProvider extends ContentProvider { migrateLauncherFavorite(db, "com.android.mms", "com.android.messaging", "com.android.mms.ui.ConversationList", "com.android.messaging.ui.conversationlist.ConversationListActivity"); + migrateLauncherFavorite(db, "com.android.camera2", "org.cyanogenmod.snap", + "com.android.camera.CameraLauncher", + "com.android.camera.CameraLauncher"); + migrateLauncherFavorite(db, "org.cyanogenmod.snap", "com.android.camera2", + "com.android.camera.CameraLauncher", + "com.android.camera.CameraLauncher"); return; } } |