diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-04-12 16:29:25 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2011-04-15 13:32:42 -0700 |
| commit | 66d72178af91d455700875635473be942bc90e54 (patch) | |
| tree | e63fe0a19648419679962aa973be5977cccb3d58 /res | |
| parent | 8a71ca86b2cd106540d407c42e6579775e429a58 (diff) | |
| download | android_packages_apps_Trebuchet-66d72178af91d455700875635473be942bc90e54.tar.gz android_packages_apps_Trebuchet-66d72178af91d455700875635473be942bc90e54.tar.bz2 android_packages_apps_Trebuchet-66d72178af91d455700875635473be942bc90e54.zip | |
Changing folders to use CellLayouts
Change-Id: Ic80bece18855a4f5d2476c224ef66f035ac7c97b
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/user_folder.xml | 15 | ||||
| -rw-r--r-- | res/layout-port/user_folder.xml | 17 | ||||
| -rw-r--r-- | res/values-land/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-port/dimens.xml | 2 |
4 files changed, 29 insertions, 7 deletions
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml index 5da4aa57e..ca437bfc5 100644 --- a/res/layout-land/user_folder.xml +++ b/res/layout-land/user_folder.xml @@ -14,7 +14,9 @@ limitations under the License. --> -<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.UserFolder + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:orientation="vertical"> <Button @@ -29,17 +31,24 @@ <FrameLayout android:layout_width="match_parent" - android:layout_height="0dip" + android:layout_height="0dip" android:layout_weight="1" android:background="@drawable/box_launcher_bottom"> - <GridView + <com.android.launcher2.CellLayout android:id="@id/folder_content" android:layout_width="match_parent" android:layout_height="match_parent" android:cacheColorHint="#ff333333" + launcher:cellWidth="@dimen/folder_cell_width" + launcher:cellHeight="@dimen/folder_cell_height" + launcher:xAxisStartPadding="0dip" + launcher:xAxisEndPadding="0dip" + launcher:yAxisStartPadding="0dip" + launcher:yAxisEndPadding="0dip" + android:scrollbarAlwaysDrawVerticalTrack="true" android:scrollbarStyle="insideInset" android:drawSelectorOnTop="false" diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml index 0e6df66c6..c00b54889 100644 --- a/res/layout-port/user_folder.xml +++ b/res/layout-port/user_folder.xml @@ -14,7 +14,9 @@ limitations under the License. --> -<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.UserFolder + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:orientation="vertical"> <Button @@ -29,16 +31,23 @@ <FrameLayout android:layout_width="match_parent" - android:layout_height="0dip" + android:layout_height="0dip" android:layout_weight="1" android:background="@drawable/box_launcher_bottom"> - <GridView + <com.android.launcher2.CellLayout android:id="@id/folder_content" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="match_parent" android:cacheColorHint="#ff333333" + launcher:cellWidth="@dimen/folder_cell_width" + launcher:cellHeight="@dimen/folder_cell_height" + launcher:xAxisStartPadding="0dip" + launcher:xAxisEndPadding="0dip" + launcher:yAxisStartPadding="0dip" + launcher:yAxisEndPadding="0dip" + android:scrollbarAlwaysDrawVerticalTrack="true" android:scrollbarStyle="insideInset" android:drawSelectorOnTop="false" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 159cbb49e..9cb549b01 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -17,5 +17,7 @@ <resources> <dimen name="workspace_cell_width">106dip</dimen> <dimen name="workspace_cell_height">74dip</dimen> + <dimen name="folder_cell_width">100dip</dimen> + <dimen name="folder_cell_height">74dip</dimen> <dimen name="button_bar_height">62dip</dimen> </resources> diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 65a3fd3e4..ad5922dda 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -17,4 +17,6 @@ <resources> <dimen name="workspace_cell_width">80dip</dimen> <dimen name="workspace_cell_height">100dip</dimen> + <dimen name="folder_cell_width">74dip</dimen> + <dimen name="folder_cell_height">86dip</dimen> </resources> |