summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-04-06 17:08:58 -0700
committerMichael Jurka <mikejurka@google.com>2011-05-13 14:39:42 -0700
commit54a4ac26898ea318f434443458680cb3014bf6fa (patch)
treed790158b8d1b3d9a30419b4993d68d14957d2067 /res
parentd82b5817d49f0abb841a4a2c9562b6c9f9f8ebe8 (diff)
downloadandroid_packages_apps_Trebuchet-54a4ac26898ea318f434443458680cb3014bf6fa.tar.gz
android_packages_apps_Trebuchet-54a4ac26898ea318f434443458680cb3014bf6fa.tar.bz2
android_packages_apps_Trebuchet-54a4ac26898ea318f434443458680cb3014bf6fa.zip
Make customization drawer deal better with a small height
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/customization_drawer.xml5
-rw-r--r--res/values/attrs.xml1
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-xlarge/customization_drawer.xml b/res/layout-xlarge/customization_drawer.xml
index 98fc9d963..a8f6ce09e 100644
--- a/res/layout-xlarge/customization_drawer.xml
+++ b/res/layout-xlarge/customization_drawer.xml
@@ -32,7 +32,7 @@
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="match_parent"
- android:layout_height="@dimen/customization_drawer_content_height">
+ android:layout_height="match_parent">
<com.android.launcher2.CustomizePagedView
android:id="@+id/customization_drawer_tab_contents"
android:layout_width="match_parent"
@@ -47,7 +47,8 @@
launcher:pageLayoutPaddingTop="40dp"
launcher:pageLayoutPaddingBottom="25dp"
launcher:pageLayoutPaddingLeft="20dp"
- launcher:pageLayoutPaddingRight="20dp" />
+ launcher:pageLayoutPaddingRight="20dp"
+ launcher:pageLayoutMaxHeight="@dimen/customization_drawer_content_height" />
</FrameLayout>
</LinearLayout>
</com.android.launcher2.CustomizeTrayTabHost> \ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2be599955..4f4425311 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -104,6 +104,7 @@
<attr name="pageLayoutPaddingBottom" format="dimension" />
<attr name="pageLayoutPaddingLeft" format="dimension" />
<attr name="pageLayoutPaddingRight" format="dimension" />
+ <attr name="pageLayoutMaxHeight" format="dimension" />
<!-- The space between adjacent pages of the PagedView. -->
<attr name="pageSpacing" format="dimension" />
</declare-styleable>