diff options
author | Michael Jurka <mikejurka@google.com> | 2011-04-07 10:31:51 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-07 10:31:51 -0700 |
commit | a16b2ab242de46fb768e09bdba088e591761569f (patch) | |
tree | 4ac022031cf467123870c7aae6159f4bb8268ce0 /res | |
parent | 91da1ebe4c47215e6fc6d50b2fb560328c8d8341 (diff) | |
parent | 36fcb74425bebc1d88c9e3102484ec902b68f202 (diff) | |
download | android_packages_apps_Trebuchet-a16b2ab242de46fb768e09bdba088e591761569f.tar.gz android_packages_apps_Trebuchet-a16b2ab242de46fb768e09bdba088e591761569f.tar.bz2 android_packages_apps_Trebuchet-a16b2ab242de46fb768e09bdba088e591761569f.zip |
Merge "Make customization drawer deal better with a small height"
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge/customization_drawer.xml | 5 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 |
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> |