summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-07-27 11:58:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-27 11:58:22 -0700
commit041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d (patch)
tree365ca6ace2e7001fc88d4b8ed76d4a14e485d15f /res
parentd2eca6b66e654e71fb46ae718910af3ec6c2cf9c (diff)
parentc51934bfdfed6a5011c6d6c5b7b70f2d75613d41 (diff)
downloadandroid_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.tar.gz
android_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.tar.bz2
android_packages_apps_Trebuchet-041b0c09c400dbbde2fb2bd0a2072ed19fb3e99d.zip
Merge "Updating portals visuals:"
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/portal_container_holo.9.pngbin9722 -> 1290 bytes
-rw-r--r--res/drawable-hdpi/portal_ring_inner_holo.pngbin10310 -> 10584 bytes
-rw-r--r--res/drawable-hdpi/portal_ring_outer_holo.pngbin17408 -> 15330 bytes
-rw-r--r--res/drawable-hdpi/portal_ring_rest.pngbin0 -> 5101 bytes
-rw-r--r--res/drawable-mdpi/portal_container_holo.9.pngbin5392 -> 810 bytes
-rw-r--r--res/drawable-mdpi/portal_ring_inner_holo.pngbin5672 -> 5698 bytes
-rw-r--r--res/drawable-mdpi/portal_ring_outer_holo.pngbin8856 -> 7821 bytes
-rw-r--r--res/drawable-mdpi/portal_ring_rest.pngbin0 -> 2904 bytes
-rw-r--r--res/drawable-xhdpi/portal_container_holo.9.pngbin2103 -> 2012 bytes
-rw-r--r--res/drawable-xhdpi/portal_ring_inner_holo.pngbin16265 -> 16805 bytes
-rw-r--r--res/layout/user_folder.xml5
-rw-r--r--res/values/dimens.xml2
12 files changed, 4 insertions, 3 deletions
diff --git a/res/drawable-hdpi/portal_container_holo.9.png b/res/drawable-hdpi/portal_container_holo.9.png
index ab846f66e..20e880867 100644
--- a/res/drawable-hdpi/portal_container_holo.9.png
+++ b/res/drawable-hdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png
index cd40594b9..7f48e7363 100644
--- a/res/drawable-hdpi/portal_ring_inner_holo.png
+++ b/res/drawable-hdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png
index 1a66a44b1..4ad47bffe 100644
--- a/res/drawable-hdpi/portal_ring_outer_holo.png
+++ b/res/drawable-hdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/portal_ring_rest.png b/res/drawable-hdpi/portal_ring_rest.png
new file mode 100644
index 000000000..5e215d34d
--- /dev/null
+++ b/res/drawable-hdpi/portal_ring_rest.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png
index 56a5b8754..90fb1d102 100644
--- a/res/drawable-mdpi/portal_container_holo.9.png
+++ b/res/drawable-mdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png
index 9addb3054..4dbae0626 100644
--- a/res/drawable-mdpi/portal_ring_inner_holo.png
+++ b/res/drawable-mdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png
index 610386934..a70acf25d 100644
--- a/res/drawable-mdpi/portal_ring_outer_holo.png
+++ b/res/drawable-mdpi/portal_ring_outer_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/portal_ring_rest.png b/res/drawable-mdpi/portal_ring_rest.png
new file mode 100644
index 000000000..c3203d942
--- /dev/null
+++ b/res/drawable-mdpi/portal_ring_rest.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_container_holo.9.png b/res/drawable-xhdpi/portal_container_holo.9.png
index 55c701bcc..3c8193bd3 100644
--- a/res/drawable-xhdpi/portal_container_holo.9.png
+++ b/res/drawable-xhdpi/portal_container_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/portal_ring_inner_holo.png b/res/drawable-xhdpi/portal_ring_inner_holo.png
index dfdd622a4..fc3d3c0c4 100644
--- a/res/drawable-xhdpi/portal_ring_inner_holo.png
+++ b/res/drawable-xhdpi/portal_ring_inner_holo.png
Binary files differ
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 6b19603f3..7597bc78e 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -45,8 +45,9 @@
android:paddingTop="@dimen/folder_content_name_gap"
android:background="#00000000"
android:hint="@string/folder_hint_text"
- android:textSize="16sp"
- android:textColor="#FFF"
+ android:textSize="14sp"
+ android:textColor="#ff33b5e5"
+ android:textColorHighlight="#ff333333"
android:gravity="center_horizontal"
android:singleLine="true"/>
</com.android.launcher2.Folder>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 215f698e3..dc18a7234 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -92,7 +92,7 @@
<dimen name="folder_preview_size">64dp</dimen>
<!-- The amount that the preview contents are inset from the preview background -->
<dimen name="folder_preview_padding">4dp</dimen>
- <dimen name="folder_content_name_gap">8dp</dimen>
+ <dimen name="folder_content_name_gap">4dp</dimen>
<dimen name="folder_width_gap">0dp</dimen>
<dimen name="folder_height_gap">0dp</dimen>
</resources>