diff options
| author | Winson Chung <winsonc@google.com> | 2011-11-08 17:35:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 17:35:51 -0800 |
| commit | 4decf123e460a22d878dff1ba193751932efaa0f (patch) | |
| tree | 7f4cc36a11f5ee45ddf7fde3e57bb25a046dc4d8 /res/values | |
| parent | 28902a756259901a1b43c12987228388a547df7e (diff) | |
| parent | 6032e7ed8e6208348a6b3f8bc1a7ecafc7951af8 (diff) | |
| download | android_packages_apps_Trebuchet-4decf123e460a22d878dff1ba193751932efaa0f.tar.gz android_packages_apps_Trebuchet-4decf123e460a22d878dff1ba193751932efaa0f.tar.bz2 android_packages_apps_Trebuchet-4decf123e460a22d878dff1ba193751932efaa0f.zip | |
Merge "Fixing issue where AllApps labels were getting clipped (Bug: 5490118)" into ics-mr1
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 8 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 5fe1abde0..125856287 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -107,10 +107,6 @@ <!-- PagedView specific attributes. These attributes are used to customize a PagedView view in XML files. --> <declare-styleable name="PagedView"> - <!-- The number of horizontal cells in a page --> - <attr name="cellCountX" /> - <!-- The number of vertical cells in a page --> - <attr name="cellCountY" /> <!-- A spacing override for the icons within a page --> <attr name="pageLayoutWidthGap" format="dimension" /> <attr name="pageLayoutHeightGap" format="dimension" /> @@ -129,6 +125,10 @@ <!-- AppsCustomizePagedView specific attributes. These attributes are used to customize an AppsCustomizePagedView in xml files. --> <declare-styleable name="AppsCustomizePagedView"> + <!-- Max number of cells of applications horizontally --> + <attr name="maxAppCellCountX" format="integer" /> + <!-- Max number of cells of applications vertically --> + <attr name="maxAppCellCountY" format="integer" /> <!-- Horizontal spacing between widgets and wallpapers --> <attr name="widgetCellWidthGap" format="dimension" /> <!-- Vertical spacing between widgets --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 83d778299..da828090e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -54,6 +54,8 @@ <dimen name="toolbar_external_icon_height">36dp</dimen> <!-- AllApps/Customize/AppsCustomize --> + <integer name="apps_customize_maxCellCountX">-1</integer> + <integer name="apps_customize_maxCellCountY">-1</integer> <!-- The height of the tab bar - if this changes, we should update the external icon width/height above to compensate --> <dimen name="apps_customize_tab_bar_height">52dp</dimen> |