Merge change 26660 into eclair
* changes:
Draw pressed states on the fake title bar.
diff --git a/res/drawable/btn_bookmark.xml b/res/drawable/btn_bookmark.xml
new file mode 100644
index 0000000..ce169d0
--- /dev/null
+++ b/res/drawable/btn_bookmark.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<!-- Custom layout file which mimics the btn_search_dialog_voice look, but draws
+ the pressed state even without window focus -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@*android:drawable/btn_search_dialog_voice_pressed" />
+ <item android:state_pressed="false"
+ android:drawable="@*android:drawable/btn_search_dialog_voice_default" />
+</selector>
diff --git a/res/drawable/title_text.xml b/res/drawable/title_text.xml
new file mode 100644
index 0000000..6a214d9
--- /dev/null
+++ b/res/drawable/title_text.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<!-- Custom layout file which mimics the standard edit_text look, but draws the
+ pressed state even without window focus -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@*android:drawable/textfield_pressed" />
+ <item android:state_pressed="false"
+ android:drawable="@*android:drawable/textfield_default" />
+</selector>
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 2c49252..01ff0ae 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -39,7 +39,7 @@
>
<LinearLayout android:id="@+id/title_bg"
- android:background="@*android:drawable/edit_text"
+ android:background="@drawable/title_text"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dip"
android:layout_marginTop="2dip"
- android:background="@*android:drawable/btn_search_dialog_voice"
+ android:background="@drawable/btn_bookmark"
android:src="@drawable/ic_btn_bookmark_browsertab"
/>
</LinearLayout>