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/layout-xlarge | |
| parent | 7ef4f752e1eee17389ca41791f83d4ac21714419 (diff) | |
| download | packages_apps_trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.zip packages_apps_trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.tar.gz packages_apps_trebuchet-d22015cd37ea6ef53762eca5be57daca123ff607.tar.bz2 | |
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/layout-xlarge')
| -rw-r--r-- | res/layout-xlarge/launcher.xml | 4 | ||||
| -rw-r--r-- | res/layout-xlarge/workspace_screen.xml | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index fa323fd..0dd25d2 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -35,8 +35,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:defaultScreen="2" - launcher:canonicalDeviceWidth="8" - launcher:canonicalDeviceHeight="4"> + launcher:cellCountX="8" + launcher:cellCountY="4"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> diff --git a/res/layout-xlarge/workspace_screen.xml b/res/layout-xlarge/workspace_screen.xml index aa892b9..6a34975 100644 --- a/res/layout-xlarge/workspace_screen.xml +++ b/res/layout-xlarge/workspace_screen.xml @@ -24,9 +24,7 @@ launcher:cellWidth="@dimen/workspace_cell_width" launcher:cellHeight="@dimen/workspace_cell_height" - launcher:longAxisStartPadding="8dip" - launcher:longAxisEndPadding="8dip" - launcher:shortAxisStartPadding="8dip" - launcher:shortAxisEndPadding="8dip" - launcher:shortAxisCells="4" - launcher:longAxisCells="8" /> + launcher:yAxisStartPadding="8dip" + launcher:yAxisEndPadding="8dip" + launcher:xAxisStartPadding="8dip" + launcher:xAxisEndPadding="8dip"/> |