diff options
| author | Adam Cohen <adamcohen@google.com> | 2010-07-26 22:02:18 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2010-08-04 11:03:47 -0700 |
| commit | d22015cd37ea6ef53762eca5be57daca123ff607 (patch) | |
| tree | fcb6a85e600ec2a4f2dd377900a0c08eac6f5116 /res/values/attrs.xml | |
| parent | 7ef4f752e1eee17389ca41791f83d4ac21714419 (diff) | |
| download | android_packages_apps_Trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.tar.gz android_packages_apps_Trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.tar.bz2 android_packages_apps_Trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.zip | |
Cleaning up grid size specification in Launcher
This commit eliminates the notion of in-place rotations and a bunch of
associated complexities (including the notion of canonical coordinates).
Further, the number of x and y cells per workspace screen is now being stored
in a single location in the XML definition of Workspace. This fixes a couple
bugs where incorrect values were being used. Finally, eliminated the notion of
"shortAxis" and "longAxis" in terms of padding and cell count. These have been
translated to corresponding x and y axis values.
Change-Id: I30cfed66f82d739355b3f01730b28b6c0437989c
Diffstat (limited to 'res/values/attrs.xml')
| -rw-r--r-- | res/values/attrs.xml | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index c977f97d4..be2728879 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -32,10 +32,10 @@ <declare-styleable name="Workspace"> <!-- The first screen the workspace should display. --> <attr name="defaultScreen" format="integer" /> - <!-- The number of horizontal cells for the device in its natural orientation --> - <attr name="canonicalDeviceWidth" format="integer" /> - <!-- The number of vertical cells for the device in its natural orientation --> - <attr name="canonicalDeviceHeight" format="integer" /> + <!-- The number of horizontal cells in the CellLayout --> + <attr name="cellCountX" format="integer" /> + <!-- The number of vertical cells in the CellLayout --> + <attr name="cellCountY" format="integer" /> </declare-styleable> <!-- CellLayout specific attributes. These attributes are used to customize @@ -46,17 +46,13 @@ <!-- The height of a single cell --> <attr name="cellHeight" format="dimension" /> <!-- Padding to apply at the start of the long axis --> - <attr name="longAxisStartPadding" format="dimension" /> + <attr name="xAxisStartPadding" format="dimension" /> <!-- Padding to apply at the end of the long axis --> - <attr name="longAxisEndPadding" format="dimension" /> + <attr name="xAxisEndPadding" format="dimension" /> <!-- Padding to apply at the start of the short axis --> - <attr name="shortAxisStartPadding" format="dimension" /> + <attr name="yAxisStartPadding" format="dimension" /> <!-- Padding to apply at the end of the short axis --> - <attr name="shortAxisEndPadding" format="dimension" /> - <!-- Number of cells on the short axis of the CellLayout --> - <attr name="shortAxisCells" format="integer" /> - <!-- Number of cells on the long axis of the CellLayout --> - <attr name="longAxisCells" format="integer" /> + <attr name="yAxisEndPadding" format="dimension" /> </declare-styleable> <!-- DeleteZone specific attributes. These attributes are used to customize |