summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-12-04 16:35:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-04 16:35:48 -0800
commit58705534ab953c6394269da671cf60066f216815 (patch)
tree3f2c7fd3b55f9dda2c71d0e1b8129274dea5fc2d
parentf9cd258be2d572095d855fc5ceef330d7b022fc0 (diff)
parenta67d1ea0db5f536ca4a954a5f958211ec6c99992 (diff)
downloadandroid_packages_apps_Trebuchet-58705534ab953c6394269da671cf60066f216815.tar.gz
android_packages_apps_Trebuchet-58705534ab953c6394269da671cf60066f216815.tar.bz2
android_packages_apps_Trebuchet-58705534ab953c6394269da671cf60066f216815.zip
am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf
* commit 'a67d1ea0db5f536ca4a954a5f958211ec6c99992': Fixing regression in drop target bar height. (Bug 11980757)
-rw-r--r--res/values-land/styles.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index ccb5fcb06..d18a57b95 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -27,7 +27,7 @@
</style>
<style name="DropTargetButtonContainer">
<item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">0dp</item>
+ <item name="android:layout_height">wrap_content</item>
</style>
<style name="DropTargetButton">
<item name="android:layout_width">wrap_content</item>