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/values | |
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/values')
-rw-r--r-- | res/values/attrs.xml | 18 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 29bd3c887..8c4dd1efd 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -93,10 +93,8 @@ <attr name="layout_ignoreInsets" format="boolean" /> </declare-styleable> - <declare-styleable name="InvariantDeviceProfile"> + <declare-styleable name="GridDisplayOption"> <attr name="name" format="string" /> - <attr name="minWidthDps" format="float" /> - <attr name="minHeightDps" format="float" /> <attr name="numRows" format="integer" /> <attr name="numColumns" format="integer" /> @@ -106,13 +104,21 @@ <!-- numHotseatIcons defaults to numColumns, if not specified --> <attr name="numHotseatIcons" format="integer" /> + <attr name="defaultLayoutId" format="reference" /> + <attr name="demoModeLayoutId" format="reference" /> + </declare-styleable> + + <declare-styleable name="ProfileDisplayOption"> + <attr name="name" /> + <attr name="minWidthDps" format="float" /> + <attr name="minHeightDps" format="float" /> + <attr name="iconSize" format="float" /> <!-- landscapeIconSize defaults to iconSize, if not specified --> <attr name="landscapeIconSize" format="float" /> <attr name="iconTextSize" format="float" /> - - <attr name="defaultLayoutId" format="reference" /> - <attr name="demoModeLayoutId" format="reference" /> + <!-- If true, this display option is used to determine the default grid --> + <attr name="canBeDefault" format="boolean" /> </declare-styleable> <declare-styleable name="CellLayout"> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8adae3618..078ce60a6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -36,7 +36,7 @@ <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen> <!-- Extra bottom padding for non-tall devices. --> <dimen name="dynamic_grid_hotseat_bottom_non_tall_padding">0dp</dimen> - <dimen name="dynamic_grid_hotseat_size">80dp</dimen> + <dimen name="dynamic_grid_hotseat_extra_vertical_size">34dp</dimen> <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen> <!-- Hotseat/all-apps scrim --> |