diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-11-29 10:33:47 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-12-07 00:06:25 -0800 |
commit | 415f17333123eb40e7677cf0766f59e7af3f7418 (patch) | |
tree | cb2573a312e63bb0602963cf3fa20d1a69f1ee5a /res/xml | |
parent | dab230f63ccf3fa184e14ffa3d10a647097d8478 (diff) | |
download | android_packages_apps_Trebuchet-415f17333123eb40e7677cf0766f59e7af3f7418.tar.gz android_packages_apps_Trebuchet-415f17333123eb40e7677cf0766f59e7af3f7418.tar.bz2 android_packages_apps_Trebuchet-415f17333123eb40e7677cf0766f59e7af3f7418.zip |
Changing the format for device profile definition
Device profiles are defined such that the grid size is fixed
and only the icon and text sizes change. For every grid size option
there are multiple display configurations.
Bug: 118758696
Change-Id: I54aac9106c576324b02530913c447e849b4ae1da
Diffstat (limited to 'res/xml')
-rw-r--r-- | res/xml/default_workspace_3x3.xml | 17 | ||||
-rw-r--r-- | res/xml/default_workspace_4x4.xml | 44 | ||||
-rw-r--r-- | res/xml/default_workspace_5x5.xml | 53 | ||||
-rw-r--r-- | res/xml/default_workspace_5x6.xml | 37 | ||||
-rw-r--r-- | res/xml/device_profiles.xml | 233 | ||||
-rw-r--r-- | res/xml/dw_phone_hotseat.xml | 70 | ||||
-rw-r--r-- | res/xml/dw_tablet_hotseat.xml | 84 |
7 files changed, 185 insertions, 353 deletions
diff --git a/res/xml/default_workspace_3x3.xml b/res/xml/default_workspace_3x3.xml index 8d9940450..31376e1d5 100644 --- a/res/xml/default_workspace_3x3.xml +++ b/res/xml/default_workspace_3x3.xml @@ -68,21 +68,4 @@ <favorite launcher:uri="market://details?id=com.android.launcher" /> </resolve> - <!-- Second last row --> - <resolve - launcher:screen="0" - launcher:x="0" - launcher:y="-2" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> - <favorite launcher:uri="http://www.example.com/" /> - </resolve> - - <resolve - launcher:screen="0" - launcher:x="2" - launcher:y="-2" > - <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> - <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> - </resolve> - </favorites> diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml index 979a1b4c8..bf3c62c77 100644 --- a/res/xml/default_workspace_4x4.xml +++ b/res/xml/default_workspace_4x4.xml @@ -16,8 +16,48 @@ <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> - <!-- Hotseat --> - <include launcher:workspace="@xml/dw_phone_hotseat" /> + <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Dialer, Messaging, Browser, Camera --> + <resolve + launcher:container="-101" + launcher:screen="0" + launcher:x="0" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> + <favorite launcher:uri="tel:123" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> + <favorite launcher:uri="sms:" /> + <favorite launcher:uri="smsto:" /> + <favorite launcher:uri="mms:" /> + <favorite launcher:uri="mmsto:" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> + <favorite launcher:uri="http://www.example.com/" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> + </resolve> <!-- Bottom row --> <resolve diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml index f9cc0e789..ccdde2ca8 100644 --- a/res/xml/default_workspace_5x5.xml +++ b/res/xml/default_workspace_5x5.xml @@ -16,8 +16,57 @@ <favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"> - <!-- Hotseat --> - <include launcher:workspace="@xml/dw_phone_hotseat" /> + <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <!-- Dialer, Messaging, [Maps/Music], Browser, Camera --> + <resolve + launcher:container="-101" + launcher:screen="0" + launcher:x="0" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> + <favorite launcher:uri="tel:123" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="1" + launcher:x="1" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> + <favorite launcher:uri="sms:" /> + <favorite launcher:uri="smsto:" /> + <favorite launcher:uri="mms:" /> + <favorite launcher:uri="mmsto:" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="2" + launcher:x="2" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" /> + <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="3" + launcher:x="3" + launcher:y="0" > + <favorite + launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> + <favorite launcher:uri="http://www.example.com/" /> + </resolve> + + <resolve + launcher:container="-101" + launcher:screen="4" + launcher:x="4" + launcher:y="0" > + <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> + <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> + </resolve> <!-- Bottom row --> <resolve diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml deleted file mode 100644 index 8493c265e..000000000 --- a/res/xml/default_workspace_5x6.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source 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-auto/com.android.launcher3"> - - <!-- Hotseat --> - <include launcher:workspace="@xml/dw_tablet_hotseat" /> - - <!-- Bottom row --> - <favorite - launcher:screen="0" - launcher:x="0" - launcher:y="-1" - launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" /> - - <resolve - launcher:screen="0" - launcher:x="-1" - launcher:y="-1" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MARKET;end" /> - <favorite launcher:uri="market://details?id=com.android.launcher" /> - </resolve> - -</favorites> diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml index ef6e14506..88b1bc95a 100644 --- a/res/xml/device_profiles.xml +++ b/res/xml/device_profiles.xml @@ -17,158 +17,109 @@ <profiles xmlns:launcher="http://schemas.android.com/apk/res-auto" > - <profile - launcher:name="Super Short Stubby" - launcher:minWidthDps="255" - launcher:minHeightDps="300" - launcher:numRows="2" - launcher:numColumns="3" - launcher:numFolderRows="2" - launcher:numFolderColumns="3" - launcher:iconSize="48" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="3" - launcher:defaultLayoutId="@xml/default_workspace_3x3" - /> - - <profile - launcher:name="Shorter Stubby" - launcher:minWidthDps="255" - launcher:minHeightDps="400" + <grid-option + launcher:name="3_by_3" launcher:numRows="3" launcher:numColumns="3" - launcher:numFolderRows="3" + launcher:numFolderRows="2" launcher:numFolderColumns="3" - launcher:iconSize="48" - launcher:iconTextSize="13.0" launcher:numHotseatIcons="3" - launcher:defaultLayoutId="@xml/default_workspace_3x3" - /> - - <profile - launcher:name="Short Stubby" - launcher:minWidthDps="275" - launcher:minHeightDps="420" - launcher:numRows="3" - launcher:numColumns="4" - launcher:numFolderRows="3" - launcher:numFolderColumns="4" - launcher:iconSize="48" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_4x4" - /> - - <profile - launcher:name="Stubby" - launcher:minWidthDps="255" - launcher:minHeightDps="450" - launcher:numRows="3" - launcher:numColumns="4" - launcher:numFolderRows="3" - launcher:numFolderColumns="4" - launcher:iconSize="48" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_4x4" - /> - - <profile - launcher:name="Nexus S" - launcher:minWidthDps="296" - launcher:minHeightDps="491.33" - launcher:numRows="4" - launcher:numColumns="4" - launcher:numFolderRows="4" - launcher:numFolderColumns="4" - launcher:iconSize="48" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_4x4" - /> - - <profile - launcher:name="Nexus 4" - launcher:minWidthDps="359" - launcher:minHeightDps="567" + launcher:defaultLayoutId="@xml/default_workspace_3x3" > + + <display-option + launcher:name="Super Short Stubby" + launcher:minWidthDps="255" + launcher:minHeightDps="300" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Shorter Stubby" + launcher:minWidthDps="255" + launcher:minHeightDps="400" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + </grid-option> + + <grid-option + launcher:name="4_by_4" launcher:numRows="4" launcher:numColumns="4" - launcher:numFolderRows="4" - launcher:numFolderColumns="4" - launcher:iconSize="54" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_4x4" - /> - - <profile - launcher:name="Nexus 5" - launcher:minWidthDps="335" - launcher:minHeightDps="567" - launcher:numRows="4" - launcher:numColumns="4" - launcher:numFolderRows="4" + launcher:numFolderRows="3" launcher:numFolderColumns="4" - launcher:iconSize="54" - launcher:iconTextSize="13.0" - launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_4x4" - /> - - <profile - launcher:name="Large Phone" - launcher:minWidthDps="406" - launcher:minHeightDps="694" + launcher:numHotseatIcons="4" + launcher:defaultLayoutId="@xml/default_workspace_4x4" > + + <display-option + launcher:name="Short Stubby" + launcher:minWidthDps="275" + launcher:minHeightDps="420" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Stubby" + launcher:minWidthDps="255" + launcher:minHeightDps="450" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Nexus S" + launcher:minWidthDps="296" + launcher:minHeightDps="491.33" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Nexus 4" + launcher:minWidthDps="359" + launcher:minHeightDps="567" + launcher:iconSize="54" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Nexus 5" + launcher:minWidthDps="335" + launcher:minHeightDps="567" + launcher:iconSize="54" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + </grid-option> + + <grid-option + launcher:name="5_by_5" launcher:numRows="5" launcher:numColumns="5" launcher:numFolderRows="4" launcher:numFolderColumns="4" - launcher:iconSize="56" - launcher:iconTextSize="14.4" launcher:numHotseatIcons="5" - launcher:defaultLayoutId="@xml/default_workspace_5x5" - /> - - <profile - launcher:name="Nexus 7" - launcher:minWidthDps="575" - launcher:minHeightDps="904" - launcher:numRows="6" - launcher:numColumns="6" - launcher:numFolderRows="4" - launcher:numFolderColumns="5" - launcher:iconSize="64" - launcher:iconTextSize="14.4" - launcher:numHotseatIcons="6" - launcher:defaultLayoutId="@xml/default_workspace_5x6" - /> - - <profile - launcher:name="Nexus 10" - launcher:minWidthDps="727" - launcher:minHeightDps="1207" - launcher:numRows="6" - launcher:numColumns="7" - launcher:numFolderRows="4" - launcher:numFolderColumns="5" - launcher:iconSize="76" - launcher:iconTextSize="14.4" - launcher:numHotseatIcons="7" - launcher:defaultLayoutId="@xml/default_workspace_5x6" - /> - - <profile - launcher:name="20-inch Tablet" - launcher:minWidthDps="1527" - launcher:minHeightDps="2527" - launcher:numRows="7" - launcher:numColumns="7" - launcher:numFolderRows="6" - launcher:numFolderColumns="6" - launcher:iconSize="100" - launcher:iconTextSize="20.0" - launcher:numHotseatIcons="7" - launcher:defaultLayoutId="@xml/default_workspace_5x6" - /> + launcher:defaultLayoutId="@xml/default_workspace_5x5" > + + <display-option + launcher:name="Large Phone" + launcher:minWidthDps="406" + launcher:minHeightDps="694" + launcher:iconSize="56" + launcher:iconTextSize="14.4" + launcher:canBeDefault="true" /> + + <display-option + launcher:name="Shorter Stubby" + launcher:minWidthDps="255" + launcher:minHeightDps="400" + launcher:iconSize="48" + launcher:iconTextSize="13.0" + launcher:canBeDefault="true" /> + + </grid-option> </profiles>
\ No newline at end of file diff --git a/res/xml/dw_phone_hotseat.xml b/res/xml/dw_phone_hotseat.xml deleted file mode 100644 index c691ebc3d..000000000 --- a/res/xml/dw_phone_hotseat.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source 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-auto/com.android.launcher3"> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <!-- Dialer, Messaging, [Maps/Music], Browser, Camera --> - <resolve - launcher:container="-101" - launcher:screen="0" - launcher:x="0" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.DIAL;end" /> - <favorite launcher:uri="tel:123" /> - <favorite launcher:uri="#Intent;action=android.intent.action.CALL_BUTTON;end" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="1" - launcher:x="1" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> - <favorite launcher:uri="sms:" /> - <favorite launcher:uri="smsto:" /> - <favorite launcher:uri="mms:" /> - <favorite launcher:uri="mmsto:" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" /> - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="3" - launcher:x="3" - launcher:y="0" > - <favorite - launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> - <favorite launcher:uri="http://www.example.com/" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="4" - launcher:x="4" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> - <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> - </resolve> - -</favorites> diff --git a/res/xml/dw_tablet_hotseat.xml b/res/xml/dw_tablet_hotseat.xml deleted file mode 100644 index 6fe7f93d8..000000000 --- a/res/xml/dw_tablet_hotseat.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 The Android Open Source 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-auto/com.android.launcher3"> - <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> - <!-- Messaging, Email, Browser, Maps, Music, Gallery, Camera --> - <resolve - launcher:container="-101" - launcher:screen="0" - launcher:x="0" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MESSAGING;end" /> - <favorite launcher:uri="sms:" /> - <favorite launcher:uri="smsto:" /> - <favorite launcher:uri="mms:" /> - <favorite launcher:uri="mmsto:" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="1" - launcher:x="1" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_EMAIL;end" /> - <favorite launcher:uri="mailto:" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="2" - launcher:x="2" - launcher:y="0" > - <favorite - launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_BROWSER;end" /> - <favorite launcher:uri="http://www.example.com/" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="3" - launcher:x="3" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MAPS;end" /> - </resolve> - - <favorite - launcher:container="-101" - launcher:screen="4" - launcher:x="4" - launcher:y="0" - launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_MUSIC;end" /> - - <resolve - launcher:container="-101" - launcher:screen="5" - launcher:x="5" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" /> - <favorite launcher:uri="#Intent;type=images/*;end" /> - </resolve> - - <resolve - launcher:container="-101" - launcher:screen="6" - launcher:x="6" - launcher:y="0" > - <favorite launcher:uri="#Intent;action=android.media.action.STILL_IMAGE_CAMERA;end" /> - <favorite launcher:uri="#Intent;action=android.intent.action.CAMERA_BUTTON;end" /> - </resolve> - -</favorites> |