summaryrefslogtreecommitdiffstats
path: root/res/layout-large
diff options
context:
space:
mode:
authorPatrick Dubroy <dubroy@google.com>2011-05-23 16:15:09 -0700
committerPatrick Dubroy <dubroy@google.com>2011-05-23 17:30:17 -0700
commit4a5ad095303ca1b6b745263269333bd087168d3c (patch)
tree8e4b206b5ea42d2ff52fac70a86aee1a8e139652 /res/layout-large
parent4c5ac591f4c88203749a051cc9b7bce92e90abee (diff)
downloadandroid_packages_apps_Trebuchet-4a5ad095303ca1b6b745263269333bd087168d3c.tar.gz
android_packages_apps_Trebuchet-4a5ad095303ca1b6b745263269333bd087168d3c.tar.bz2
android_packages_apps_Trebuchet-4a5ad095303ca1b6b745263269333bd087168d3c.zip
Dynamically determine size of customize tray.
Change-Id: I13235bbd01df8c31eb9bdfe88913db55624d8b9b
Diffstat (limited to 'res/layout-large')
-rw-r--r--res/layout-large/customization_drawer.xml13
-rw-r--r--res/layout-large/launcher.xml2
2 files changed, 6 insertions, 9 deletions
diff --git a/res/layout-large/customization_drawer.xml b/res/layout-large/customization_drawer.xml
index d8db066b0..0c59a3f96 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 6a16eb530..2d141373f 100644
--- a/res/layout-large/launcher.xml
+++ b/res/layout-large/launcher.xml
@@ -44,7 +44,7 @@
<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"
android:visibility="invisible" />
</com.android.launcher2.DragLayer>