diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-11 11:48:36 -0700 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-13 22:30:02 +0000 |
commit | 087502d2d3ff3a638e59d9873930a7e0c553ff66 (patch) | |
tree | c4b39cc73293a05ed17e407c0327ca0f3eed171a /res/xml-sw720dp | |
parent | 8816c012cae3581a545781a424a16c13c773536c (diff) | |
download | android_packages_apps_Trebuchet-087502d2d3ff3a638e59d9873930a7e0c553ff66.tar.gz android_packages_apps_Trebuchet-087502d2d3ff3a638e59d9873930a7e0c553ff66.tar.bz2 android_packages_apps_Trebuchet-087502d2d3ff3a638e59d9873930a7e0c553ff66.zip |
Trebuchet : Default workspace improvements
This reverts commit b54b34edd5c87e6d0702793b423b14dc24fb1076
Fix bug for mdpi devices crash loop.
Revert requires overlays to know if GSF installed,
adding a run time check to load default workspaces.
Add in additional overlays per density for new LauncherModel
and LauncherProvider 4.4.3 logic.
Change-Id: I5709182521e80d273e892eb3310abd68acac95ad
Diffstat (limited to 'res/xml-sw720dp')
-rw-r--r-- | res/xml-sw720dp/default_workspace.xml | 75 | ||||
-rw-r--r-- | res/xml-sw720dp/default_workspace_gapps.xml | 170 | ||||
-rw-r--r-- | res/xml-sw720dp/default_workspace_no_telephony.xml | 75 | ||||
-rw-r--r-- | res/xml-sw720dp/default_workspace_no_telephony_gapps.xml | 171 |
4 files changed, 341 insertions, 150 deletions
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml index 1b94256d9..85920d732 100644 --- a/res/xml-sw720dp/default_workspace.xml +++ b/res/xml-sw720dp/default_workspace.xml @@ -26,37 +26,6 @@ launcher:spanX="6" launcher:spanY="3" /> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:container="-100" - launcher:screen="1" - launcher:x="7" - launcher:y="4" /> - <folder - launcher:screen="1" - launcher:x="0" - launcher:y="4" - launcher:title="@string/google_title"> - <favorite - launcher:className="com.google.android.maps.MapsActivity" - launcher:packageName="com.google.android.apps.maps" /> - <favorite - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:packageName="com.google.android.gm" /> - <favorite - launcher:className="com.google.android.apps.plus.phone.HomeActivity" - launcher:packageName="com.google.android.apps.plus" /> - <favorite - launcher:className="com.android.calendar.AllInOneActivity" - launcher:packageName="com.google.android.calendar" /> - <favorite - launcher:className="com.google.android.maps.driveabout.app.DestinationActivity" - launcher:packageName="com.google.android.apps.maps" /> - <favorite - launcher:className="com.google.android.apps.plus.phone.ConversationListActivity" - launcher:packageName="com.google.android.apps.plus" /> - </folder> - <favorite launcher:packageName="com.bel.android.dspmanager" launcher:className="com.bel.android.dspmanager.activity.DSPManager" launcher:screen="1" @@ -71,13 +40,6 @@ <!-- Screen [2] --> <favorite - launcher:packageName="com.cyanogenmod.gallerynext" - launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" - launcher:container="-100" - launcher:screen="2" - launcher:x="0" - launcher:y="4" /> - <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" launcher:container="-100" @@ -92,15 +54,6 @@ launcher:x="7" launcher:y="4" /> <appwidget - launcher:packageName="com.android.vending" - launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:container="-100" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="6" - launcher:spanY="4"/> - <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" launcher:screen="2" @@ -111,13 +64,6 @@ <!-- Hotseat --> <favorite - launcher:packageName="com.google.android.talk" - launcher:className="com.google.android.talk.SigningInActivity" - launcher:container="-101" - launcher:screen="5" - launcher:x="5" - launcher:y="0" /> - <favorite launcher:packageName="com.android.mms" launcher:className="com.android.mms.ui.ConversationList" launcher:container="-101" @@ -125,13 +71,6 @@ launcher:x="5" launcher:y="0" /> <favorite - launcher:packageName="com.android.chrome" - launcher:className="com.google.android.apps.chrome.Main" - launcher:container="-101" - launcher:screen="6" - launcher:x="6" - launcher:y="0" /> - <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" @@ -139,13 +78,6 @@ launcher:x="6" launcher:y="0" /> <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" - launcher:y="0" /> - <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" @@ -153,13 +85,6 @@ launcher:x="3" launcher:y="0" /> <favorite - launcher:packageName="com.google.android.youtube" - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite launcher:packageName="com.android.contacts" launcher:className="com.android.contacts.activities.PeopleActivity" launcher:container="-101" diff --git a/res/xml-sw720dp/default_workspace_gapps.xml b/res/xml-sw720dp/default_workspace_gapps.xml new file mode 100644 index 000000000..2a65712cc --- /dev/null +++ b/res/xml-sw720dp/default_workspace_gapps.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013-2014 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> + <!-- Screen [1] --> + <appwidget + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" + launcher:screen="1" + launcher:x="1" + launcher:y="0" + launcher:spanX="6" + launcher:spanY="3" /> + <favorite + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <folder + launcher:screen="1" + launcher:x="0" + launcher:y="4" + launcher:title="@string/google_title"> + <favorite + launcher:className="com.google.android.maps.MapsActivity" + launcher:packageName="com.google.android.apps.maps" /> + <favorite + launcher:className="com.google.android.gm.ConversationListActivityGmail" + launcher:packageName="com.google.android.gm" /> + <favorite + launcher:className="com.google.android.apps.plus.phone.HomeActivity" + launcher:packageName="com.google.android.apps.plus" /> + <favorite + launcher:className="com.android.calendar.AllInOneActivity" + launcher:packageName="com.google.android.calendar" /> + <favorite + launcher:className="com.google.android.maps.driveabout.app.DestinationActivity" + launcher:packageName="com.google.android.apps.maps" /> + <favorite + launcher:className="com.google.android.apps.plus.phone.ConversationListActivity" + launcher:packageName="com.google.android.apps.plus" /> + </folder> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyngn.gallerynext" + launcher:className="com.cyngn.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="7" + launcher:y="4" /> + <appwidget + launcher:packageName="com.android.vending" + launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" + launcher:y="0" + launcher:spanX="6" + launcher:spanY="4"/> + <appwidget + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.widget.MmsWidgetProvider" + launcher:screen="2" + launcher:x="2" + launcher:y="0" + launcher:spanX="4" + launcher:spanY="2" /> + + <!-- Hotseat --> + <favorite + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" + launcher:container="-101" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.ui.ConversationList" + launcher:container="-101" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.chrome" + launcher:className="com.google.android.apps.chrome.Main" + launcher:container="-101" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" + launcher:container="-101" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.camera2" + launcher:className="com.android.camera.CameraLauncher" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + +</favorites> diff --git a/res/xml-sw720dp/default_workspace_no_telephony.xml b/res/xml-sw720dp/default_workspace_no_telephony.xml index cfbd6e2c1..df557bff9 100644 --- a/res/xml-sw720dp/default_workspace_no_telephony.xml +++ b/res/xml-sw720dp/default_workspace_no_telephony.xml @@ -26,37 +26,6 @@ launcher:spanX="6" launcher:spanY="3"/> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:container="-100" - launcher:screen="1" - launcher:x="7" - launcher:y="4" /> - <folder - launcher:screen="1" - launcher:x="0" - launcher:y="4" - launcher:title="@string/google_title"> - <favorite - launcher:className="com.google.android.maps.MapsActivity" - launcher:packageName="com.google.android.apps.maps" /> - <favorite - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:packageName="com.google.android.gm" /> - <favorite - launcher:className="com.google.android.apps.plus.phone.HomeActivity" - launcher:packageName="com.google.android.apps.plus" /> - <favorite - launcher:className="com.android.calendar.AllInOneActivity" - launcher:packageName="com.google.android.calendar" /> - <favorite - launcher:className="com.google.android.maps.driveabout.app.DestinationActivity" - launcher:packageName="com.google.android.apps.maps" /> - <favorite - launcher:className="com.google.android.apps.plus.phone.ConversationListActivity" - launcher:packageName="com.google.android.apps.plus" /> - </folder> - <favorite launcher:packageName="com.bel.android.dspmanager" launcher:className="com.bel.android.dspmanager.activity.DSPManager" launcher:screen="1" @@ -71,13 +40,6 @@ <!-- Screen [2] --> <favorite - launcher:packageName="com.cyanogenmod.gallerynext" - launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" - launcher:container="-100" - launcher:screen="2" - launcher:x="0" - launcher:y="4" /> - <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" launcher:container="-100" @@ -92,15 +54,6 @@ launcher:x="7" launcher:y="4" /> <appwidget - launcher:packageName="com.android.vending" - launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:container="-100" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="6" - launcher:spanY="4"/> - <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" launcher:container="-100" @@ -112,13 +65,6 @@ <!-- Hotseat --> <favorite - launcher:packageName="com.google.android.talk" - launcher:className="com.google.android.talk.SigningInActivity" - launcher:container="-101" - launcher:screen="5" - launcher:x="5" - launcher:y="0" /> - <favorite launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" @@ -126,13 +72,6 @@ launcher:x="5" launcher:y="0" /> <favorite - launcher:packageName="com.android.chrome" - launcher:className="com.google.android.apps.chrome.Main" - launcher:container="-101" - launcher:screen="6" - launcher:x="6" - launcher:y="0" /> - <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" @@ -140,13 +79,6 @@ launcher:x="6" launcher:y="0" /> <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" - launcher:y="0" /> - <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" @@ -154,13 +86,6 @@ launcher:x="3" launcher:y="0" /> <favorite - launcher:packageName="com.google.android.youtube" - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite launcher:packageName="com.android.contacts" launcher:className="com.android.contacts.activities.PeopleActivity" launcher:container="-101" diff --git a/res/xml-sw720dp/default_workspace_no_telephony_gapps.xml b/res/xml-sw720dp/default_workspace_no_telephony_gapps.xml new file mode 100644 index 000000000..2deae95e4 --- /dev/null +++ b/res/xml-sw720dp/default_workspace_no_telephony_gapps.xml @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013-2014 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> + <!-- Screen [1] --> + <appwidget + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" + launcher:screen="1" + launcher:x="1" + launcher:y="0" + launcher:spanX="6" + launcher:spanY="3"/> + <favorite + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <folder + launcher:screen="1" + launcher:x="0" + launcher:y="4" + launcher:title="@string/google_title"> + <favorite + launcher:className="com.google.android.maps.MapsActivity" + launcher:packageName="com.google.android.apps.maps" /> + <favorite + launcher:className="com.google.android.gm.ConversationListActivityGmail" + launcher:packageName="com.google.android.gm" /> + <favorite + launcher:className="com.google.android.apps.plus.phone.HomeActivity" + launcher:packageName="com.google.android.apps.plus" /> + <favorite + launcher:className="com.android.calendar.AllInOneActivity" + launcher:packageName="com.google.android.calendar" /> + <favorite + launcher:className="com.google.android.maps.driveabout.app.DestinationActivity" + launcher:packageName="com.google.android.apps.maps" /> + <favorite + launcher:className="com.google.android.apps.plus.phone.ConversationListActivity" + launcher:packageName="com.google.android.apps.plus" /> + </folder> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" + launcher:x="7" + launcher:y="4" /> + <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + + <!-- Screen [2] --> + <favorite + launcher:packageName="com.cyngn.gallerynext" + launcher:className="com.cyngn.gallerynext.app.GalleryActivity" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.gallery3d" + launcher:className="com.android.gallery3d.app.Gallery" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.Settings" + launcher:container="-100" + launcher:screen="2" + launcher:x="7" + launcher:y="4" /> + <appwidget + launcher:packageName="com.android.vending" + launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" + launcher:y="0" + launcher:spanX="6" + launcher:spanY="4"/> + <appwidget + launcher:packageName="com.android.settings" + launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" + launcher:container="-100" + launcher:screen="2" + launcher:x="2" + launcher:y="0" + launcher:spanX="4" + launcher:spanY="1" /> + + <!-- Hotseat --> + <favorite + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" + launcher:container="-101" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.email" + launcher:className="com.android.email.activity.Welcome" + launcher:container="-101" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.chrome" + launcher:className="com.google.android.apps.chrome.Main" + launcher:container="-101" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" + launcher:container="-101" + launcher:screen="6" + launcher:x="6" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.camera2" + launcher:className="com.android.camera.CameraLauncher" + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" /> + +</favorites> |