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 | |
parent | eeb46723716c41ba6c6660001ffac4c53cc11cb1 (diff) | |
download | android_packages_apps_Trebuchet-138a04170d964da9cdec228e95b976875ae52481.tar.gz android_packages_apps_Trebuchet-138a04170d964da9cdec228e95b976875ae52481.tar.bz2 android_packages_apps_Trebuchet-138a04170d964da9cdec228e95b976875ae52481.zip |
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')
-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 | |||
-rw-r--r-- | res/layout/widget_search.xml | 79 | ||||
-rw-r--r-- | res/xml/default_workspace.xml | 2 |
9 files changed, 69 insertions, 43 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 000000000..b140b24b6 --- /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 000000000..4c3d683e7 --- /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 000000000..a2007ad92 --- /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 000000000..80f3dca34 --- /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 000000000..247abca85 --- /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 000000000..d628cbca1 --- /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 000000000..9e935273e --- /dev/null +++ b/res/drawable/textfield_searchwidget_selected.9.png diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml index 1db8488a9..841b1550d 100644 --- a/res/layout/widget_search.xml +++ b/res/layout/widget_search.xml @@ -14,52 +14,47 @@ limitations under the License. --> -<com.android.launcher.Search xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher.Search + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:id="@+id/widget_search" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="horizontal" - android:background="@drawable/search_bg" - android:gravity="center_vertical" - > + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="top"> - <ImageView - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/search_plate" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingRight="3dip" - android:src="@drawable/google_logo" /> - - <com.android.launcher.SearchAutoCompleteTextView - android:id="@+id/input" - android:layout_width="0dip" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_marginTop="1dip" - android:hint="@string/search_hint" - android:focusableInTouchMode="false" - android:singleLine="true" - android:selectAllOnFocus="true" - android:completionThreshold="1" - android:inputType="textAutoComplete" - android:imeOptions="actionSearch" - android:lines="1" - android:dropDownWidth="fill_parent" - android:popupBackground="@drawable/spinner_dropdown_background" + android:orientation="horizontal" + android:paddingLeft="12dip" + android:paddingRight="12dip" + android:paddingTop="7dip" + android:paddingBottom="13dip" + android:background="@drawable/search_floater" > + + <TextView + android:id="@+id/search_src_text" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1.0" + android:editable="false" + android:inputType="text" + android:background="@drawable/textfield_searchwidget" + android:textAppearance="?android:attr/textAppearanceMediumInverse" + android:textColor="@android:color/primary_text_light" /> - <ImageButton android:id="@+id/search_go_btn" - android:layout_marginLeft="5dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@*android:drawable/ic_btn_search" - style="@style/SearchButton" - /> - - <ImageButton android:id="@+id/search_voice_btn" - android:layout_marginLeft="4dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@android:drawable/ic_btn_speak_now" - style="@style/SearchButton" - /> + <ImageButton + android:id="@+id/search_voice_btn" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_marginLeft="8dip" + android:background="@*android:drawable/btn_search_dialog_voice" + android:src="@*android:drawable/ic_btn_speak_now" + /> + + </LinearLayout> </com.android.launcher.Search> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index ae2e2a6e0..2280b6126 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -19,7 +19,7 @@ <clock launcher:screen="2" launcher:x="1" - launcher:y="0" /> + launcher:y="1" /> <search launcher:screen="1" |