diff options
author | Karl Rosaen <> | 2009-04-23 19:00:21 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-23 19:00:21 -0700 |
commit | 138a04170d964da9cdec228e95b976875ae52481 (patch) | |
tree | 4e96d9d2806cab619764d2ff29f8431822be926e /res/drawable | |
parent | eeb46723716c41ba6c6660001ffac4c53cc11cb1 (diff) | |
download | packages_apps_trebuchet-138a04170d964da9cdec228e95b976875ae52481.zip packages_apps_trebuchet-138a04170d964da9cdec228e95b976875ae52481.tar.gz packages_apps_trebuchet-138a04170d964da9cdec228e95b976875ae52481.tar.bz2 |
AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
- all new public apis are @hidden; they will still get reviewed by api council once we're in git
- other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
to the contacts provider that was reviewed by jham
Automated import of CL 147564
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/search_button_bg.9.png | bin | 0 -> 676 bytes | |||
-rw-r--r-- | res/drawable/search_button_voice.png | bin | 0 -> 965 bytes | |||
-rw-r--r-- | res/drawable/search_floater.9.png | bin | 0 -> 777 bytes | |||
-rw-r--r-- | res/drawable/textfield_searchwidget.xml | 31 | ||||
-rw-r--r-- | res/drawable/textfield_searchwidget_default.9.png | bin | 0 -> 1742 bytes | |||
-rw-r--r-- | res/drawable/textfield_searchwidget_pressed.9.png | bin | 0 -> 2032 bytes | |||
-rw-r--r-- | res/drawable/textfield_searchwidget_selected.9.png | bin | 0 -> 1886 bytes |
7 files changed, 31 insertions, 0 deletions
diff --git a/res/drawable/search_button_bg.9.png b/res/drawable/search_button_bg.9.png Binary files differnew file mode 100644 index 0000000..b140b24 --- /dev/null +++ b/res/drawable/search_button_bg.9.png diff --git a/res/drawable/search_button_voice.png b/res/drawable/search_button_voice.png Binary files differnew file mode 100644 index 0000000..4c3d683 --- /dev/null +++ b/res/drawable/search_button_voice.png diff --git a/res/drawable/search_floater.9.png b/res/drawable/search_floater.9.png Binary files differnew file mode 100644 index 0000000..a2007ad --- /dev/null +++ b/res/drawable/search_floater.9.png diff --git a/res/drawable/textfield_searchwidget.xml b/res/drawable/textfield_searchwidget.xml new file mode 100644 index 0000000..80f3dca --- /dev/null +++ b/res/drawable/textfield_searchwidget.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/textfield_searchwidget_default" /> + + <item android:state_pressed="true" + android:drawable="@drawable/textfield_searchwidget_pressed" /> + + <item android:state_enabled="true" android:state_focused="true" + android:drawable="@drawable/textfield_searchwidget_selected" /> + + <item android:state_enabled="true" + android:drawable="@drawable/textfield_searchwidget_default" /> + +</selector> diff --git a/res/drawable/textfield_searchwidget_default.9.png b/res/drawable/textfield_searchwidget_default.9.png Binary files differnew file mode 100644 index 0000000..247abca --- /dev/null +++ b/res/drawable/textfield_searchwidget_default.9.png diff --git a/res/drawable/textfield_searchwidget_pressed.9.png b/res/drawable/textfield_searchwidget_pressed.9.png Binary files differnew file mode 100644 index 0000000..d628cbc --- /dev/null +++ b/res/drawable/textfield_searchwidget_pressed.9.png diff --git a/res/drawable/textfield_searchwidget_selected.9.png b/res/drawable/textfield_searchwidget_selected.9.png Binary files differnew file mode 100644 index 0000000..9e93527 --- /dev/null +++ b/res/drawable/textfield_searchwidget_selected.9.png |