diff options
| author | Winson Chung <winsonc@google.com> | 2011-11-07 14:14:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 14:14:55 -0800 |
| commit | a0654a3523cecfaa0800086753b8738ce3bc1d35 (patch) | |
| tree | d27200db013de944ffb8f19fa8e5218971590b7b /res | |
| parent | 6c53e555e9358ea41aec28d8098623a35f24e32f (diff) | |
| parent | 620542254c9b63cd17d2deefb07ffd39d8a54623 (diff) | |
| download | android_packages_apps_Trebuchet-a0654a3523cecfaa0800086753b8738ce3bc1d35.tar.gz android_packages_apps_Trebuchet-a0654a3523cecfaa0800086753b8738ce3bc1d35.tar.bz2 android_packages_apps_Trebuchet-a0654a3523cecfaa0800086753b8738ce3bc1d35.zip | |
Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-port/search_bar.xml | 2 | ||||
| -rw-r--r-- | res/values/attrs.xml | 6 |
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"> |