hardware keyboard support
http://b/issue?id=3368141
http://b/issue?id=3368100
Removed duplicate key handling
added focus transition from page to url bar
once framework bug http://b/issue?id=3381411
is fixed, focus transitions in url bar will be fixed
Change-Id: Id5011e78bf70d51a25a4e01cf31d9e6ad95ceab7
diff --git a/res/drawable/url_background.xml b/res/drawable/url_background.xml
new file mode 100644
index 0000000..f719c29
--- /dev/null
+++ b/res/drawable/url_background.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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_focused="true"
+ android:drawable="@drawable/textfield_active_holo_dark" />
+ <item
+ android:state_focused="false"
+ android:drawable="@drawable/textfield_default_holo_dark" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 0f500c7..62ef2f3 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -53,8 +53,6 @@
android:textColor="@color/white"
android:gravity="center_vertical"
android:scrollHorizontally="true"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="24dip"
android:lines="1"
android:singleLine="true" />
<ImageButton
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 3a4e4bb..20081f0 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/stop"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -50,7 +50,7 @@
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
android:orientation="horizontal"
- android:background="@drawable/textfield_default_holo_dark">
+ android:background="@drawable/url_background">
<ImageView
android:id="@+id/voice_icon"
android:layout_width="wrap_content"
@@ -66,6 +66,7 @@
android:visibility="gone" />
<com.android.browser.UrlInputView
android:id="@+id/url_focused"
+ android:focusable="true"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="match_parent"
@@ -83,13 +84,13 @@
android:inputType="textUri"
android:imeOptions="actionGo"
style="@style/Suggestions" />
- <ImageView
+ <ImageButton
android:id="@+id/star"
android:src="@drawable/btn_imageview_star"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/clear"
android:src="@drawable/ic_stop_holo_dark"
android:layout_width="wrap_content"
@@ -104,7 +105,7 @@
android:visibility="gone"
android:gravity="center_vertical"
style="@style/HoloButton" />
- <ImageView
+ <ImageButton
android:id="@+id/voicesearch"
android:src="@drawable/ic_voice_search_holo_dark"
android:layout_width="wrap_content"
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index bd255ae..1b52c9a 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -39,7 +39,7 @@
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
android:icon="@drawable/ic_downloads_holo_dark"
- android:alphabeticShortcut="d" />
+ android:alphabeticShortcut="j" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
android:icon="@drawable/ic_settings_holo_dark"
@@ -77,14 +77,12 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
- <item android:id="@+id/back_menu_id"
- android:alphabeticShortcut="j" />
- <item android:id="@+id/forward_menu_id"
- android:alphabeticShortcut="k" />
+ <item android:id="@+id/back_menu_id" />
+ <item android:id="@+id/forward_menu_id" />
<item android:id="@+id/bookmarks_menu_id"
android:alphabeticShortcut="b" />
<item android:id="@+id/add_bookmark_menu_id"
- android:alphabeticShortcut="a" />
+ android:alphabeticShortcut="d" />
<item android:id="@+id/stop_reload_menu_id"
android:alphabeticShortcut="r" />
<item android:id="@+id/goto_menu_id"
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 594681a..beaa8f3 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -23,8 +23,7 @@
<item android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
android:alphabeticShortcut="b"
- android:icon="@drawable/ic_bookmarks_holo_dark"
- />
+ android:icon="@drawable/ic_bookmarks_holo_dark" />
<item android:id="@+id/active_tabs_menu_id"
android:title="@string/active_tabs"
android:icon="@drawable/ic_windows_holo_dark"
@@ -33,12 +32,11 @@
android:alphabeticShortcut="r" />
<item android:id="@+id/forward_menu_id"
android:title="@string/forward"
- android:alphabeticShortcut="k"
android:icon="@*android:drawable/ic_menu_forward" />
<item android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
android:icon="@drawable/ic_bookmark_on_holo_dark"
- android:alphabeticShortcut="a" />
+ android:alphabeticShortcut="d" />
<item android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"
android:icon="@*android:drawable/ic_menu_find"
@@ -54,7 +52,7 @@
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
android:icon="@drawable/ic_downloads_holo_dark"
- android:alphabeticShortcut="d" />
+ android:alphabeticShortcut="j" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
android:icon="@drawable/ic_settings_holo_dark"
@@ -92,8 +90,7 @@
android:alphabeticShortcut="7" />
<item android:id="@+id/window_eight_menu_id"
android:alphabeticShortcut="8" />
- <item android:id="@+id/back_menu_id"
- android:alphabeticShortcut="j" />
+ <item android:id="@+id/back_menu_id" />
<item android:id="@+id/goto_menu_id"
android:alphabeticShortcut="l" />
<item android:id="@+id/close_menu_id"