diff options
author | Patrick Dubroy <dubroy@google.com> | 2011-05-23 16:15:09 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-05-23 20:55:01 -0700 |
commit | 1a0093367d567294eb6b3c82445cb42c305918ae (patch) | |
tree | f442e96e0cb7778797ab62c3225da43be1afafc6 /res | |
parent | e72300ee5911df4f5acaa32afda9fc04a391e2a7 (diff) | |
download | android_packages_apps_Trebuchet-1a0093367d567294eb6b3c82445cb42c305918ae.tar.gz android_packages_apps_Trebuchet-1a0093367d567294eb6b3c82445cb42c305918ae.tar.bz2 android_packages_apps_Trebuchet-1a0093367d567294eb6b3c82445cb42c305918ae.zip |
DO NOT MERGE Dynamically determine size of customize tray.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-large/customization_drawer.xml | 13 | ||||
-rw-r--r-- | res/layout-large/launcher.xml | 2 | ||||
-rw-r--r-- | res/values-large-land/dimens.xml | 14 | ||||
-rw-r--r-- | res/values-large-port/dimens.xml | 12 | ||||
-rw-r--r-- | res/values-large/dimens.xml | 10 |
5 files changed, 31 insertions, 20 deletions
diff --git a/res/layout-large/customization_drawer.xml b/res/layout-large/customization_drawer.xml index a8f6ce09e..2009117b9 100644 --- a/res/layout-large/customization_drawer.xml +++ b/res/layout-large/customization_drawer.xml @@ -40,15 +40,12 @@ launcher:wallpaperCellSpanX="@integer/customization_drawer_contents_wallpaperCellSpanX" launcher:wallpaperCellCountX="@integer/customization_drawer_contents_wallpaperCellCountX" launcher:widgetCellCountX="@integer/customization_drawer_contents_widgetCellCountX" - launcher:cellCountX="@integer/customization_drawer_contents_cellCountX" - launcher:cellCountY="@integer/customization_drawer_contents_cellCountY" launcher:pageLayoutWidthGap="@dimen/customization_drawer_contents_pageLayoutWidthGap" - launcher:pageLayoutHeightGap="12dp" - launcher:pageLayoutPaddingTop="40dp" - launcher:pageLayoutPaddingBottom="25dp" - launcher:pageLayoutPaddingLeft="20dp" - launcher:pageLayoutPaddingRight="20dp" - launcher:pageLayoutMaxHeight="@dimen/customization_drawer_content_height" /> + launcher:pageLayoutHeightGap="@dimen/customization_drawer_contents_pageLayoutHeightGap" + launcher:pageLayoutPaddingTop="@dimen/customization_drawer_contents_pageLayoutPaddingTop" + launcher:pageLayoutPaddingBottom="@dimen/customization_drawer_contents_pageLayoutPaddingBottom" + launcher:pageLayoutPaddingLeft="@dimen/customization_drawer_contents_pageLayoutPaddingLeft" + launcher:pageLayoutPaddingRight="@dimen/customization_drawer_contents_pageLayoutPaddingRight" /> </FrameLayout> </LinearLayout> </com.android.launcher2.CustomizeTrayTabHost>
\ No newline at end of file diff --git a/res/layout-large/launcher.xml b/res/layout-large/launcher.xml index 25ef36328..f95dd4e97 100644 --- a/res/layout-large/launcher.xml +++ b/res/layout-large/launcher.xml @@ -42,6 +42,6 @@ <include layout="@layout/customization_drawer" android:id="@+id/customization_drawer" android:layout_width="match_parent" - android:layout_height="@dimen/customization_drawer_height" + android:layout_height="wrap_content" android:layout_gravity="bottom" /> </com.android.launcher2.DragLayer> diff --git a/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml index 0f7e0eddf..eeb16f4d4 100644 --- a/res/values-large-land/dimens.xml +++ b/res/values-large-land/dimens.xml @@ -19,9 +19,6 @@ or right while you're dragging. --> <dimen name="scroll_zone">100dip</dimen> - <dimen name="customization_drawer_height">480dp</dimen> - <dimen name="customization_drawer_content_height">420dp</dimen> - <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutHeightGap">6dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingTop">20dp</dimen> @@ -29,10 +26,15 @@ <dimen name="all_apps_view_pageLayoutPaddingLeft">40dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingRight">40dp</dimen> + <!-- Dimensions for customize should generally be the same as all apps, or very similar. --> + <dimen name="customization_drawer_contents_pageLayoutWidthGap">32dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutHeightGap">12dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingTop">20dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingBottom">20dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingLeft">40dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingRight">40dp</dimen> + <integer name="customization_drawer_contents_wallpaperCellSpanX">3</integer> <integer name="customization_drawer_contents_wallpaperCellCountX">12</integer> <integer name="customization_drawer_contents_widgetCellCountX">14</integer> - <integer name="customization_drawer_contents_cellCountX">8</integer> - <integer name="customization_drawer_contents_cellCountY">3</integer> - <dimen name="customization_drawer_contents_pageLayoutWidthGap">32dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-large-port/dimens.xml b/res/values-large-port/dimens.xml index 2ea9e3875..89f86053e 100644 --- a/res/values-large-port/dimens.xml +++ b/res/values-large-port/dimens.xml @@ -19,9 +19,6 @@ or right while you're dragging. --> <dimen name="scroll_zone">40dp</dimen> - <dimen name="customization_drawer_height">800dp</dimen> - <dimen name="customization_drawer_content_height">420dp</dimen> - <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen> @@ -32,7 +29,12 @@ <integer name="customization_drawer_contents_wallpaperCellSpanX">3</integer> <integer name="customization_drawer_contents_wallpaperCellCountX">9</integer> <integer name="customization_drawer_contents_widgetCellCountX">9</integer> - <integer name="customization_drawer_contents_cellCountX">5</integer> - <integer name="customization_drawer_contents_cellCountY">3</integer> + + <!-- Dimensions for customize should generally be the same as all apps, or very similar. --> <dimen name="customization_drawer_contents_pageLayoutWidthGap">36dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutHeightGap">12dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingTop">25dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingBottom">25dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingLeft">20dp</dimen> + <dimen name="customization_drawer_contents_pageLayoutPaddingRight">20dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml index 0c0d60e24..7bc8ec0fa 100644 --- a/res/values-large/dimens.xml +++ b/res/values-large/dimens.xml @@ -82,4 +82,14 @@ <!-- How much the content view of an alert dialog should be inset (currently used for the WallpaperChooser in XLarge mode) --> <dimen name="alert_dialog_content_inset">0dp</dimen> + + <!-- The actual number of rows/columns will be determined dynamically based on the screen + size, but in portrait we want to cap the rows at 3, otherwise it looks weird. --> + <integer name="customization_drawer_contents_maxCellCountY">3</integer> + + <!-- The percentage of vertical space that the customize tray should try to fill. --> + <integer name="customization_drawer_verticalFillPercentage">65</integer> + + <!-- Max number of rows in all apps, because too many looks weird. --> + <integer name="all_apps_view_maxCellCountY">6</integer> </resources> |