No load home page.
Rather than load a home page, bring up the browser/new tabs
displaying the bookmarks page, with a search bar that can be
clicked to open the omnibox. Also rearrange the menu. Fix for
http://b/issue?id=2018524
diff --git a/res/drawable/search.9.png b/res/drawable/search.9.png
new file mode 100644
index 0000000..037e8f0
--- /dev/null
+++ b/res/drawable/search.9.png
Binary files differ
diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml
index 4fa102b..908dd43 100644
--- a/res/layout/tabs.xml
+++ b/res/layout/tabs.xml
@@ -13,29 +13,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/tabhost"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <LinearLayout
- android:orientation="vertical"
+ android:layout_height="fill_parent"
+ >
+ <TextView android:id="@+id/search"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/search"
+ android:singleLine="true"
+ />
+ <TabHost
+ android:id="@android:id/tabhost"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
- <TabWidget android:id="@android:id/tabs"
+ <LinearLayout
+ android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="1dip"
- android:paddingRight="1dip"
- android:paddingTop="4dip"
- />
+ android:layout_height="fill_parent">
- <FrameLayout android:id="@android:id/tabcontent"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- />
- </LinearLayout>
-</TabHost>
\ No newline at end of file
+ <TabWidget android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="1dip"
+ android:paddingRight="1dip"
+ android:paddingTop="4dip"
+ />
+
+ <FrameLayout android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ />
+ </LinearLayout>
+ </TabHost>
+</LinearLayout>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 088fb6e..32217eb 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -20,17 +20,17 @@
android:title="@string/goto_dot"
android:alphabeticShortcut="l"
android:icon="@android:drawable/ic_menu_search"/>
- <item android:id="@+id/bookmarks_menu_id"
- android:title="@string/bookmarks"
- android:alphabeticShortcut="b"
- android:icon="@drawable/ic_menu_bookmark" />
+ <item android:id="@+id/stop_reload_menu_id"
+ android:alphabeticShortcut="r" />
<item android:id="@+id/windows_menu_id"
android:title="@string/view_tabs"
android:alphabeticShortcut="t"
android:titleCondensed="@string/view_tabs_condensed"
android:icon="@drawable/ic_menu_windows" />
- <item android:id="@+id/stop_reload_menu_id"
- android:alphabeticShortcut="r" />
+ <item android:id="@+id/back_menu_id"
+ android:title="@string/back"
+ android:drawable="@*android:drawable/ic_menu_back"
+ android:alphabeticShortcut="j" />
<item android:id="@+id/forward_menu_id"
android:title="@string/forward"
android:alphabeticShortcut="k"
@@ -57,8 +57,6 @@
android:visible="false" />
</group>
<group android:id="@+id/MAIN_SHORTCUT_MENU" android:visible="false">
- <item android:id="@+id/back_menu_id"
- android:alphabeticShortcut="j" />
<item android:id="@+id/close_menu_id"
android:alphabeticShortcut="w" />
<item android:id="@+id/homepage_menu_id"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fb4295c..eeb9f11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,8 @@
<string name="stop">Stop</string>
<!-- Menu item to reload or refresh the current page. -->
<string name="reload">Refresh</string>
+ <!-- Menu item to go back to the previous page -->
+ <string name="back">Back</string>
<!-- Menu item to go to the next page (only useful if the user has previously hit back.) -->
<string name="forward">Forward</string>
<!-- Button label to confirm saving a bookmark. -->
