summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-03-04 11:42:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-04 11:42:29 -0800
commitc151b8d1145ab8d44079f3dd8965e8ba4f84bc0a (patch)
tree735fd118cd391c6335bdb3e37efdb7cb968e2281 /res
parent0b304f6f36817e2cc8192efc678850a037c18c71 (diff)
parent320b2fb5eff8750d07dc9b4874c2ec0b92a601b8 (diff)
downloadandroid_packages_apps_Trebuchet-c151b8d1145ab8d44079f3dd8965e8ba4f84bc0a.tar.gz
android_packages_apps_Trebuchet-c151b8d1145ab8d44079f3dd8965e8ba4f84bc0a.tar.bz2
android_packages_apps_Trebuchet-c151b8d1145ab8d44079f3dd8965e8ba4f84bc0a.zip
am 320b2fb5: Merge "Adding background protection for AllApps." into honeycomb-mr1
* commit '320b2fb5eff8750d07dc9b4874c2ec0b92a601b8': Adding background protection for AllApps.
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/button_bar.xml6
-rw-r--r--res/values/attrs.xml10
2 files changed, 15 insertions, 1 deletions
diff --git a/res/layout-xlarge/button_bar.xml b/res/layout-xlarge/button_bar.xml
index 6cd8e8896..5c96c5ced 100644
--- a/res/layout-xlarge/button_bar.xml
+++ b/res/layout-xlarge/button_bar.xml
@@ -89,7 +89,7 @@
android:focusable="false"
android:clickable="true" />
- <TextView
+ <com.android.launcher2.StrokedTextView
android:id="@+id/all_apps_button"
android:text="@string/all_apps_button_label"
android:drawablePadding="@dimen/all_apps_button_drawable_padding"
@@ -107,6 +107,10 @@
android:textColor="#CCFFFFFF"
android:textSize="18sp"
+ launcher:strokeColor="#991e3157"
+ launcher:strokeTextColor="#DDFFFFFF"
+ launcher:strokeWidth="2.5"
+
android:shadowColor="#DA000000"
android:shadowDx="0.0"
android:shadowDy="0.0"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 5e6a2ab64..2be599955 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -61,6 +61,16 @@
</declare-styleable>
+ <!-- StrokedTextView specific attributes. -->
+ <declare-styleable name="StrokedTextView">
+ <!-- The color of the stroke outline -->
+ <attr name="strokeColor" format="color" />
+ <!-- The color of the text -->
+ <attr name="strokeTextColor" format="color" />
+ <!-- The width of the stroke -->
+ <attr name="strokeWidth" format="float" />
+ </declare-styleable>
+
<!-- PagedViewIcon specific attributes. These attributes are used to customize
a PagedViewIcon view in XML files. -->
<declare-styleable name="PagedViewIcon">