summaryrefslogtreecommitdiffstats
path: root/chips/res
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2011-11-01 11:55:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-01 11:55:03 -0700
commit16770784e15e2c34000226e29f33b13695103df5 (patch)
tree6ec5622bbbf68f2923aa15b135c0eaaf8d352ddb /chips/res
parent01821f44b0d2a518cc5f5635bb0456d04064804a (diff)
parent708e23ffcc1bca889f7c528633dfe0f295ed9304 (diff)
downloadandroid_frameworks_ex-16770784e15e2c34000226e29f33b13695103df5.tar.gz
android_frameworks_ex-16770784e15e2c34000226e29f33b13695103df5.tar.bz2
android_frameworks_ex-16770784e15e2c34000226e29f33b13695103df5.zip
Merge "Cleanup offsets for tablet and crespo chips dropdown" into ics-mr1
Diffstat (limited to 'chips/res')
-rw-r--r--chips/res/layout/chips_recipient_dropdown_item.xml3
-rw-r--r--chips/res/values-sw600dp/styles.xml4
-rw-r--r--chips/res/values/styles.xml2
3 files changed, 5 insertions, 4 deletions
diff --git a/chips/res/layout/chips_recipient_dropdown_item.xml b/chips/res/layout/chips_recipient_dropdown_item.xml
index 3f0497e..cd11d67 100644
--- a/chips/res/layout/chips_recipient_dropdown_item.xml
+++ b/chips/res/layout/chips_recipient_dropdown_item.xml
@@ -43,7 +43,8 @@
android:layout_height="wrap_content"
android:paddingLeft="16dip"
android:singleLine="true"
- android:ellipsize="end" />
+ android:ellipsize="end"
+ android:layout_marginTop="-4dip" />
</LinearLayout>
<ImageView
android:id="@android:id/icon"
diff --git a/chips/res/values-sw600dp/styles.xml b/chips/res/values-sw600dp/styles.xml
index 912c368..b6014ea 100644
--- a/chips/res/values-sw600dp/styles.xml
+++ b/chips/res/values-sw600dp/styles.xml
@@ -24,6 +24,6 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:dropDownVerticalOffset">0dip</item>
- <item name="android:dropDownHorizontalOffset">0dip</item>
+ <item name="android:dropDownHorizontalOffset">-4dip</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/chips/res/values/styles.xml b/chips/res/values/styles.xml
index 4cf4f80..2b04b4f 100644
--- a/chips/res/values/styles.xml
+++ b/chips/res/values/styles.xml
@@ -22,7 +22,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:dropDownVerticalOffset">-6dip</item>
- <item name="android:dropDownHorizontalOffset">0dip</item>
+ <item name="android:dropDownHorizontalOffset">-16dip</item>
<item name="android:minHeight">48dip</item>
<item name="android:lineSpacingExtra">4dip</item>
</style>