summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-29 01:33:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-29 01:34:00 +0000
commit88400d521e9c46382d835f42c1d50235cf99b2eb (patch)
tree6cb182d6e62b697608a176498d5a9a3aec7b34ad /res
parent76bf5553e083aea1aa91f07d4a9433263501c575 (diff)
parent6e1c0d34bb31cacc24c57c89ab01deaa8985814f (diff)
downloadandroid_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.tar.gz
android_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.tar.bz2
android_packages_apps_Trebuchet-88400d521e9c46382d835f42c1d50235cf99b2eb.zip
Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic
Diffstat (limited to 'res')
-rw-r--r--res/layout/folder_icon.xml5
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/styles.xml2
3 files changed, 6 insertions, 2 deletions
diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml
index 44056828c..5147f9960 100644
--- a/res/layout/folder_icon.xml
+++ b/res/layout/folder_icon.xml
@@ -30,5 +30,8 @@
android:src="@drawable/portal_ring_inner_holo"/>
<com.android.launcher3.BubbleTextView
style="@style/WorkspaceIcon"
- android:id="@+id/folder_icon_name" />
+ android:id="@+id/folder_icon_name"
+ android:layout_gravity="top"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
</com.android.launcher3.FolderIcon>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b4b2367c7..dcddc09ad 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,6 +20,7 @@
<dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
<dimen name="dynamic_grid_search_bar_height">48dp</dimen>
<dimen name="dynamic_grid_page_indicator_height">24dp</dimen>
+ <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
<!-- Wallpaper picker -->
<dimen name="wallpaperThumbnailWidth">106.5dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a1d2c5ccf..39e55d894 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -98,7 +98,7 @@
<style name="WorkspaceIcon.AppsCustomize">
<item name="android:background">@null</item>
<item name="android:textColor">@color/apps_customize_icon_text_color</item>
- <item name="android:drawablePadding">4dp</item>
+ <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item>
<item name="android:shadowRadius">4.0</item>
<item name="android:shadowColor">#FF000000</item>
</style>