summaryrefslogtreecommitdiffstats
path: root/chips/res
diff options
context:
space:
mode:
authorMindy Pereira <mindyp@google.com>2011-06-07 14:41:32 -0700
committerMindy Pereira <mindyp@google.com>2011-06-07 15:47:55 -0700
commite6f595ab1f8409f23978baae564ad3cb9e0b5f41 (patch)
treed25dcf3c973a8a0839ffb47609a6949dca1b4518 /chips/res
parent4ed0433e005c8a39355ab270e0dd869b481df21d (diff)
downloadandroid_frameworks_ex-e6f595ab1f8409f23978baae564ad3cb9e0b5f41.tar.gz
android_frameworks_ex-e6f595ab1f8409f23978baae564ad3cb9e0b5f41.tar.bz2
android_frameworks_ex-e6f595ab1f8409f23978baae564ad3cb9e0b5f41.zip
Asset updates from Ux.
Larger chips, better delete asset, better fonts. Change-Id: I1d706d5b56bd496e51c772e65d3456d0f3239a43
Diffstat (limited to 'chips/res')
-rw-r--r--chips/res/drawable-hdpi/chip_delete.pngbin2167 -> 1339 bytes
-rw-r--r--chips/res/drawable-mdpi/chip_delete.pngbin2167 -> 1339 bytes
-rw-r--r--chips/res/drawable/chip_background_normal.xml2
-rw-r--r--chips/res/drawable/chip_background_selected.xml2
-rw-r--r--chips/res/values/attrs.xml2
-rw-r--r--chips/res/values/dimen.xml4
6 files changed, 7 insertions, 3 deletions
diff --git a/chips/res/drawable-hdpi/chip_delete.png b/chips/res/drawable-hdpi/chip_delete.png
index 71980d7..e06b62d 100644
--- a/chips/res/drawable-hdpi/chip_delete.png
+++ b/chips/res/drawable-hdpi/chip_delete.png
Binary files differ
diff --git a/chips/res/drawable-mdpi/chip_delete.png b/chips/res/drawable-mdpi/chip_delete.png
index 71980d7..e06b62d 100644
--- a/chips/res/drawable-mdpi/chip_delete.png
+++ b/chips/res/drawable-mdpi/chip_delete.png
Binary files differ
diff --git a/chips/res/drawable/chip_background_normal.xml b/chips/res/drawable/chip_background_normal.xml
index 5a0d1a0..8cb0fc8 100644
--- a/chips/res/drawable/chip_background_normal.xml
+++ b/chips/res/drawable/chip_background_normal.xml
@@ -15,7 +15,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#b8ccdc"/>
+ <solid android:color="#c2e9f7"/>
<padding android:left="6dp" android:right="6dp" android:top="2dp"
android:bottom="2dp"/>
</shape>
diff --git a/chips/res/drawable/chip_background_selected.xml b/chips/res/drawable/chip_background_selected.xml
index 6e107e5..63e2bc9 100644
--- a/chips/res/drawable/chip_background_selected.xml
+++ b/chips/res/drawable/chip_background_selected.xml
@@ -15,7 +15,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="#97def8"/>
+ <solid android:color="#34b7e6"/>
<padding android:left="6dp" android:right="6dp" android:top="2dp"
android:bottom="2dp"/>
</shape>
diff --git a/chips/res/values/attrs.xml b/chips/res/values/attrs.xml
index b51c6df..1efaccd 100644
--- a/chips/res/values/attrs.xml
+++ b/chips/res/values/attrs.xml
@@ -16,6 +16,8 @@
<resources>
<add-resource type="dimen" name="chip_padding"></add-resource>
+ <add-resource type="dimen" name="chip_height"></add-resource>
+ <add-resource type="dimen" name="chip_text_size"></add-resource>
<add-resource type="color" name="default_chip_background"></add-resource>
<add-resource type="string" name="more_string"></add-resource>
</resources> \ No newline at end of file
diff --git a/chips/res/values/dimen.xml b/chips/res/values/dimen.xml
index 9756b38..ef1cd77 100644
--- a/chips/res/values/dimen.xml
+++ b/chips/res/values/dimen.xml
@@ -15,5 +15,7 @@
-->
<resources>
- <dimen name="chip_padding">4dip</dimen>
+ <dimen name="chip_padding">8dip</dimen>
+ <dimen name="chip_height">34dip</dimen>
+ <dimen name="chip_text_size">14sp</dimen>
</resources> \ No newline at end of file