summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-11-03 13:12:50 -0700
committerWinson Chung <winsonc@google.com>2011-11-03 16:31:47 -0700
commit620542254c9b63cd17d2deefb07ffd39d8a54623 (patch)
tree3d4c53edea1c22b599d975115a1913c7261451df /res
parent14cee9a9bb10807362595f1d1e486716f997fc00 (diff)
downloadandroid_packages_apps_Trebuchet-620542254c9b63cd17d2deefb07ffd39d8a54623.tar.gz
android_packages_apps_Trebuchet-620542254c9b63cd17d2deefb07ffd39d8a54623.tar.bz2
android_packages_apps_Trebuchet-620542254c9b63cd17d2deefb07ffd39d8a54623.zip
Altering touch feedback for qsb assets. (Bug: 5560273)
- Removing some dead code Change-Id: If6f3ffcf28249ca08c23089acb5bcd501b455119
Diffstat (limited to 'res')
-rw-r--r--res/layout-port/search_bar.xml2
-rw-r--r--res/values/attrs.xml6
2 files changed, 8 insertions, 0 deletions
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 5c20ec08e..09c6e0986 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -24,6 +24,7 @@
<!-- Global search icon -->
<com.android.launcher2.HolographicLinearLayout
style="@style/SearchButton"
+ launcher:sourceImageViewId="@+id/search_button"
android:id="@+id/search_button_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -45,6 +46,7 @@
<!-- Voice search icon -->
<com.android.launcher2.HolographicLinearLayout
style="@style/SearchButton.Voice"
+ launcher:sourceImageViewId="@+id/voice_button"
android:id="@+id/voice_button_container"
android:layout_width="@dimen/search_bar_height"
android:layout_height="match_parent"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 800aeaa5c..5fe1abde0 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -80,6 +80,12 @@
<attr name="strokeWidth" format="float" />
</declare-styleable>
+ <!-- HolographicLinearLayout specific attributes. -->
+ <declare-styleable name="HolographicLinearLayout">
+ <!-- The source view to generate and apply the drawable states to/from -->
+ <attr name="sourceImageViewId" format="integer" />
+ </declare-styleable>
+
<!-- PagedViewIcon specific attributes. These attributes are used to customize
a PagedViewIcon view in XML files. -->
<declare-styleable name="PagedViewIcon">