diff options
| author | Patrick Dubroy <dubroy@google.com> | 2011-05-20 14:10:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 14:10:47 -0700 |
| commit | c0079e96971d5301b1c22e3dd1a65ef35a11a3cd (patch) | |
| tree | 4b444e55a7871b044edc8c9d2bb7604109a729f2 /res | |
| parent | be355170592dffd6be406f06c7985d4914d08737 (diff) | |
| parent | 244d74cb353f1260c4d633e719bf84bb3b6e52bc (diff) | |
| download | android_packages_apps_Trebuchet-c0079e96971d5301b1c22e3dd1a65ef35a11a3cd.tar.gz android_packages_apps_Trebuchet-c0079e96971d5301b1c22e3dd1a65ef35a11a3cd.tar.bz2 android_packages_apps_Trebuchet-c0079e96971d5301b1c22e3dd1a65ef35a11a3cd.zip | |
Merge "Dynamically determine # of rows/cols in All Apps."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-large/all_apps_tabbed.xml | 2 | ||||
| -rw-r--r-- | res/values-large-land/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-large-port/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values-large/config.xml | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/res/layout-large/all_apps_tabbed.xml b/res/layout-large/all_apps_tabbed.xml index b00b3c325..1a20440e8 100644 --- a/res/layout-large/all_apps_tabbed.xml +++ b/res/layout-large/all_apps_tabbed.xml @@ -101,8 +101,6 @@ android:id="@+id/all_apps_paged_view" android:layout_width="match_parent" android:layout_height="wrap_content" - launcher:cellCountX="@integer/all_apps_view_cellCountX" - launcher:cellCountY="@integer/all_apps_view_cellCountY" launcher:pageLayoutWidthGap="@dimen/all_apps_view_pageLayoutWidthGap" launcher:pageLayoutHeightGap="@dimen/all_apps_view_pageLayoutHeightGap" launcher:pageLayoutPaddingTop="@dimen/all_apps_view_pageLayoutPaddingTop" diff --git a/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml index 196cdb0a4..0f7e0eddf 100644 --- a/res/values-large-land/dimens.xml +++ b/res/values-large-land/dimens.xml @@ -22,8 +22,6 @@ <dimen name="customization_drawer_height">480dp</dimen> <dimen name="customization_drawer_content_height">420dp</dimen> - <integer name="all_apps_view_cellCountX">7</integer> - <integer name="all_apps_view_cellCountY">5</integer> <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutHeightGap">6dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingTop">20dp</dimen> diff --git a/res/values-large-port/dimens.xml b/res/values-large-port/dimens.xml index 47cac78e8..2ea9e3875 100644 --- a/res/values-large-port/dimens.xml +++ b/res/values-large-port/dimens.xml @@ -22,8 +22,6 @@ <dimen name="customization_drawer_height">800dp</dimen> <dimen name="customization_drawer_content_height">420dp</dimen> - <integer name="all_apps_view_cellCountX">5</integer> - <integer name="all_apps_view_cellCountY">7</integer> <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen> <dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen> diff --git a/res/values-large/config.xml b/res/values-large/config.xml index 99ee1ec58..8b7769659 100644 --- a/res/values-large/config.xml +++ b/res/values-large/config.xml @@ -21,6 +21,9 @@ Should be an even number, for pixel alignment. --> <integer name="config_dragViewExtraPixels">0</integer> + <!-- When shrinking the workspace, this is the percentage of its original size. --> + <integer name="config_workspaceShrinkPercent">17</integer> + <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation of the bright green hover outline, and then fade out the outline at the end. These are the values used in that animation --> |