diff options
| -rw-r--r-- | res/layout-land/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 6 | ||||
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | res/xml-sw600dp/default_workspace.xml | 192 | ||||
| -rw-r--r-- | res/xml-sw600dp/default_workspace_no_telephony.xml | 190 | ||||
| -rw-r--r-- | res/xml-sw720dp/default_workspace.xml | 182 | ||||
| -rw-r--r-- | res/xml-sw720dp/default_workspace_no_telephony.xml | 183 | ||||
| -rw-r--r-- | res/xml/default_workspace.xml | 80 | ||||
| -rw-r--r-- | res/xml/default_workspace_no_telephony.xml | 86 | ||||
| -rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
11 files changed, 425 insertions, 508 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3666b5986..2f64efe39 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -94,6 +94,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <include layout="@layout/all_apps_cling" + android:id="@+id/all_apps_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 4f6aaf503..7b0d770ec 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -94,6 +94,12 @@ android:layout_height="match_parent" android:visibility="invisible" /> + <include layout="@layout/all_apps_cling" + android:id="@+id/all_apps_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + <include layout="@layout/overview_panel" android:id="@+id/overview_panel" android:visibility="gone" /> diff --git a/res/values/config.xml b/res/values/config.xml index 3c1dc36f7..b7880fe1f 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -33,7 +33,7 @@ <integer name="config_appsCustomizeWorkspaceAnimationStagger">40</integer> <integer name="config_workspaceAppsCustomizeAnimationStagger">100</integer> - <integer name="config_workspaceDefaultScreen">1</integer> + <integer name="config_workspaceDefaultScreen">0</integer> <!-- Tab transition animation duration --> <integer name="config_tabTransitionDuration">250</integer> diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml index 15bae7feb..64896f245 100644 --- a/res/xml-sw600dp/default_workspace.xml +++ b/res/xml-sw600dp/default_workspace.xml @@ -15,57 +15,27 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="1" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="4" - launcher:y="5" /> + launcher:spanX="5" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" launcher:x="4" - launcher:y="5" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> + launcher:y="4" /> <folder - launcher:screen="2" - launcher:x="1" - launcher:y="5" + launcher:screen="1" + launcher:x="0" + launcher:y="4" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,92 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="4" - launcher:y="5" /> + launcher:y="4" /> - <!-- Right screen [3] --> + <!-- 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" + 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="4" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="5" + launcher:spanY="4" /> <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="4" - launcher:y="5" /> - - <!-- Far-right screen [4] --> + launcher:spanX="5" + launcher:spanY="2" /> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.dialer.DialtactsActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="1" - launcher:x="1" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.mms" launcher:className="com.android.mms.ui.ConversationList" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.android.email" - launcher:className="com.android.email.activity.Welcome" - launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.GalleryActivity" + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="1" + launcher:x="1" launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" /> + </favorites> diff --git a/res/xml-sw600dp/default_workspace_no_telephony.xml b/res/xml-sw600dp/default_workspace_no_telephony.xml index 96162ef28..fb81f178b 100644 --- a/res/xml-sw600dp/default_workspace_no_telephony.xml +++ b/res/xml-sw600dp/default_workspace_no_telephony.xml @@ -15,57 +15,27 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="1" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="4" - launcher:y="5" /> + launcher:spanX="5" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" launcher:x="4" - launcher:y="5" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="1" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> + launcher:y="4" /> <folder - launcher:screen="2" - launcher:x="1" - launcher:y="5" + launcher:screen="1" + launcher:x="0" + launcher:y="4" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,92 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="4" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="4" - launcher:y="5" /> + launcher:y="4" /> - <!-- Right screen [3] --> + <!-- 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" + 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="4" + launcher:y="4" /> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="5" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" - launcher:x="1" + launcher:container="-100" + launcher:screen="2" + launcher:x="0" launcher:y="0" - launcher:spanX="4" + launcher:spanX="5" launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" - launcher:y="5" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="4" - launcher:y="5" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <favorite - launcher:packageName="com.android.contacts" - launcher:className="com.android.contacts.activities.PeopleActivity" - launcher:container="-101" - launcher:screen="1" - launcher:x="1" - launcher:y="0" /> + <!-- Hotseat --> <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" - launcher:screen="2" - launcher:x="2" + launcher:screen="4" + launcher:x="4" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" - launcher:x="4" + launcher:screen="5" + launcher:x="5" + launcher:y="0" /> + <favorite + launcher:packageName="com.google.android.music" + launcher:className="com.android.music.activitymanagement.TopLevelActivity" + launcher:container="-101" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite launcher:packageName="com.android.camera2" launcher:className="com.android.camera.CameraLauncher" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="2" + launcher:x="2" launcher:y="0" /> <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.GalleryActivity" + launcher:packageName="com.google.android.youtube" + launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" launcher:container="-101" - launcher:screen="5" - launcher:x="5" + launcher:screen="1" + launcher:x="1" launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" /> + </favorites> diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml index 15e054b1b..e9231cc37 100644 --- a/res/xml-sw720dp/default_workspace.xml +++ b/res/xml-sw720dp/default_workspace.xml @@ -15,56 +15,26 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="5" - launcher:y="4" /> + launcher:spanX="6" + launcher:spanY="3" /> <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" - launcher:x="5" + launcher:x="7" launcher:y="4" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="2" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> <folder - launcher:screen="2" - launcher:x="2" + launcher:screen="1" + launcher:x="0" launcher:y="4" launcher:title="@string/google_title"> <favorite @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,85 +57,114 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" - launcher:x="5" + 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" /> - <!-- Right screen [3] --> + <!-- 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" + 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:screen="3" - launcher:x="2" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="2" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="5" - launcher:y="4" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.dialer" - launcher:className="com.android.contacts.dialer.DialtactsActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" + 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="3" - launcher:x="3" + 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="5" - launcher:x="5" + 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="5" - launcher:x="5" + 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="6" - launcher:x="6" + 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 7f6799089..b15cebbb4 100644 --- a/res/xml-sw720dp/default_workspace_no_telephony.xml +++ b/res/xml-sw720dp/default_workspace_no_telephony.xml @@ -15,56 +15,26 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> + <!-- Screen [1] --> <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" + launcher:packageName="com.cyanogenmod.lockclock" + launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" + launcher:container="-100" launcher:screen="1" - launcher:x="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="3"/> <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="5" - launcher:y="4" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:packageName="com.android.vending" + launcher:className="com.android.vending.AssetBrowserActivity" + launcher:container="-100" launcher:screen="1" - launcher:x="5" + launcher:x="7" launcher:y="4" /> - - <!-- Middle screen [2] --> - <appwidget - launcher:packageName="com.cyanogenmod.lockclock" - launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" - launcher:x="2" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="3" /> <folder - launcher:screen="2" - launcher:x="2" + launcher:screen="1" + launcher:x="0" launcher:y="4" launcher:title="@string/google_title"> <favorite @@ -77,15 +47,6 @@ launcher:className="com.google.android.apps.plus.phone.HomeActivity" launcher:packageName="com.google.android.apps.plus" /> <favorite - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:packageName="com.google.android.music" /> - <favorite - launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity" - launcher:packageName="com.google.android.youtube" /> - <favorite - launcher:className="com.google.android.talk.SigningInActivity" - launcher:packageName="com.google.android.talk" /> - <favorite launcher:className="com.android.calendar.AllInOneActivity" launcher:packageName="com.google.android.calendar" /> <favorite @@ -96,85 +57,115 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite - launcher:packageName="com.android.vending" - launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" - launcher:x="5" + 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" /> - <!-- Right screen [3] --> + <!-- 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" + 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:screen="3" - launcher:x="2" + launcher:container="-100" + launcher:screen="2" + launcher:x="1" launcher:y="0" - launcher:spanX="4" - launcher:spanY="2" /> + launcher:spanX="6" + launcher:spanY="4"/> <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" + launcher:container="-100" + launcher:screen="2" launcher:x="2" launcher:y="0" launcher:spanX="4" launcher:spanY="1" /> - <favorite - launcher:packageName="com.android.gallery3d" - launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="2" - launcher:y="4" /> - <favorite - launcher:packageName="com.android.settings" - launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="5" - launcher:y="4" /> - <!-- Far-right screen [4] --> - - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Hotseat --> <favorite - launcher:packageName="com.android.contacts" - launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:packageName="com.google.android.talk" + launcher:className="com.google.android.talk.SigningInActivity" launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" /> - <favorite - launcher:packageName="com.google.android.gm" - launcher:className="com.google.android.gm.ConversationListActivityGmail" - launcher:container="-101" - launcher:screen="3" - launcher:x="3" + 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="3" - launcher:x="3" + 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="5" - launcher:x="5" + 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="5" - launcher:x="5" + 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="6" - launcher:x="6" + 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/default_workspace.xml b/res/xml/default_workspace.xml index bc2d2342a..54a9a0487 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -15,54 +15,16 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="3" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - - <!-- Middle screen [2] --> + <!-- Screen [1] --> <appwidget launcher:packageName="com.cyanogenmod.lockclock" launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" + launcher:screen="1" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> + <folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" launcher:packageName="com.google.android.apps.maps" /> @@ -92,17 +54,29 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.vending" launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:screen="1" + launcher:x="3" + launcher:y="3" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="3" launcher:y="3" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" @@ -110,26 +84,30 @@ <appwidget launcher:packageName="com.android.mms" launcher:className="com.android.mms.widget.MmsWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:screen="2" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" + launcher:screen="2" + launcher:x="0" launcher:y="3" /> <favorite launcher:packageName="com.android.settings" launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="2" + launcher:screen="2" + launcher:x="3" launcher:y="3" /> - <!-- Far-right screen [4] --> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> <favorite launcher:packageName="com.android.dialer" diff --git a/res/xml/default_workspace_no_telephony.xml b/res/xml/default_workspace_no_telephony.xml index d0eda9cf3..ce11edd35 100644 --- a/res/xml/default_workspace_no_telephony.xml +++ b/res/xml/default_workspace_no_telephony.xml @@ -15,54 +15,16 @@ limitations under the License. --> <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher3"> - <!-- Far-left screen [0] --> - - <!-- Left screen [1] --> - <appwidget - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.MediaAppWidgetProvider" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <appwidget - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.appwidgets.AppWidgetSmall" - launcher:screen="1" - launcher:x="0" - launcher:y="0" - launcher:spanX="4" - launcher:spanY="1" /> - <favorite - launcher:packageName="com.bel.android.dspmanager" - launcher:className="com.bel.android.dspmanager.activity.DSPManager" - launcher:screen="1" - launcher:x="1" - launcher:y="3" /> - <favorite - launcher:packageName="com.google.android.music" - launcher:className="com.android.music.activitymanagement.TopLevelActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - <favorite - launcher:packageName="com.andrew.apollo" - launcher:className="com.andrew.apollo.ui.activities.HomeActivity" - launcher:screen="1" - launcher:x="2" - launcher:y="3" /> - - <!-- Middle screen [2] --> + <!-- Screen [1] --> <appwidget launcher:packageName="com.cyanogenmod.lockclock" launcher:className="com.cyanogenmod.lockclock.ClockWidgetProvider" - launcher:screen="2" + launcher:screen="1" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="2" /> - <folder launcher:screen="2" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> + <folder launcher:screen="1" launcher:x="0" launcher:y="3" launcher:title="@string/google_title"> <favorite launcher:className="com.google.android.maps.MapsActivity" launcher:packageName="com.google.android.apps.maps" /> @@ -92,17 +54,29 @@ launcher:packageName="com.google.android.apps.plus" /> </folder> <favorite + launcher:packageName="com.andrew.apollo" + launcher:className="com.andrew.apollo.ui.activities.HomeActivity" + launcher:screen="1" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.vending" launcher:className="com.android.vending.AssetBrowserActivity" - launcher:screen="2" + launcher:screen="1" + launcher:x="3" + launcher:y="3" /> + <favorite + launcher:packageName="com.bel.android.dspmanager" + launcher:className="com.bel.android.dspmanager.activity.DSPManager" + launcher:screen="1" launcher:x="3" launcher:y="3" /> - <!-- Right screen [3] --> + <!-- Screen [2] --> <appwidget launcher:packageName="com.android.vending" launcher:className="com.google.android.finsky.widget.consumption.NowPlayingWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" @@ -110,26 +84,30 @@ <appwidget launcher:packageName="com.android.settings" launcher:className="com.android.settings.widget.SettingsAppWidgetProvider" - launcher:screen="3" + launcher:screen="2" launcher:x="0" launcher:y="0" launcher:spanX="4" launcher:spanY="1" /> <favorite + launcher:packageName="com.cyanogenmod.gallerynext" + launcher:className="com.cyanogenmod.gallerynext.app.GalleryActivity" + launcher:screen="2" + launcher:x="0" + launcher:y="3" /> + <favorite launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" - launcher:screen="3" - launcher:x="1" + launcher:screen="2" + launcher:x="0" launcher:y="3" /> <favorite launcher:packageName="com.android.settings" launcher:className="com.android.settings.Settings" - launcher:screen="3" - launcher:x="2" + launcher:screen="2" + launcher:x="3" launcher:y="3" /> - <!-- Far-right screen [4] --> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> <favorite launcher:packageName="com.android.contacts" @@ -149,21 +127,21 @@ launcher:packageName="com.android.email" launcher:className="com.android.email.activity.Welcome" launcher:container="-101" - launcher:screen="3" + launcher:screen="1" launcher:x="1" launcher:y="0" /> <favorite launcher:packageName="com.android.chrome" launcher:className="com.google.android.apps.chrome.Main" launcher:container="-101" - launcher:screen="0" + launcher:screen="3" launcher:x="3" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" + launcher:screen="3" launcher:x="3" launcher:y="0" /> <favorite diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 3329901c6..9be3134c1 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -178,7 +178,7 @@ class DeviceProfile { // Hotseat hotseatIconSize = invDistWeightedInterpolate(minWidth, minHeight, points); hotseatIconSizePx = DynamicGrid.pxFromDp(hotseatIconSize, dm); - hotseatAllAppsRank = (int) (numColumns / 2); + hotseatAllAppsRank = (int) Math.ceil(numColumns / 2); // Calculate other vars based on Configuration updateFromConfiguration(resources, wPx, hPx, awPx, ahPx); @@ -543,7 +543,7 @@ public class DynamicGrid { // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", - 575, 904, 6, 6, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); + 575, 904, 5, 5, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); // Larger tablet profiles always have system bars on the top & bottom deviceProfiles.add(new DeviceProfile("Nexus 10", 727, 1207, 5, 8, (useLargeIcons ? 80 : 64), 14.4f, 9, (useLargeIcons ? 64 : 56))); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ee808df63..c6ef2b7bf 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1321,7 +1321,7 @@ public class LauncherModel extends BroadcastReceiver { + item.cellY + ") occupied by " + occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0]); - if (occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT) + if (occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0].itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) { deleteOnItemOverlap.set(true); } |