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-land | |
| 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/layout-land')
| -rw-r--r-- | res/layout-land/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-land/workspace_screen.xml | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 1f13f1fb3..8d38a3d61 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -24,14 +24,16 @@ <include layout="@layout/all_apps" /> - <!-- The workspace contains 3 screens of cells --> + <!-- The workspace contains 5 screens of cells --> <com.android.launcher2.Workspace android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="horizontal" android:fadeScrollbars="true" - launcher:defaultScreen="2"> + launcher:defaultScreen="2" + launcher:cellCountX="4" + 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-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml index 315e68b05..9323f58ac 100644 --- a/res/layout-land/workspace_screen.xml +++ b/res/layout-land/workspace_screen.xml @@ -24,9 +24,7 @@ launcher:cellWidth="@dimen/workspace_cell_width" launcher:cellHeight="@dimen/workspace_cell_height" - launcher:longAxisStartPadding="65dip" - launcher:longAxisEndPadding="65dip" - launcher:shortAxisStartPadding="0dip" - launcher:shortAxisEndPadding="0dip" - launcher:shortAxisCells="4" - launcher:longAxisCells="4" /> + launcher:xAxisStartPadding="65dip" + launcher:xAxisEndPadding="65dip" + launcher:yAxisStartPadding="0dip" + launcher:yAxisEndPadding="0dip"/> |