Move ComboView to its own activity
Bugs: 5009130 3368824
Change-Id: I559bb88a1e759172ef9a7d2a8b41ea4c7e523ec6
diff --git a/res/drawable-nodpi/bg_browser.png b/res/drawable-nodpi/bg_browser.png
deleted file mode 100644
index c7907d7..0000000
--- a/res/drawable-nodpi/bg_browser.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/bookmarks_history.xml b/res/layout/bookmarks_history.xml
index 826fe49..5ec310c 100644
--- a/res/layout/bookmarks_history.xml
+++ b/res/layout/bookmarks_history.xml
@@ -17,6 +17,4 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/bg_browser"
- android:paddingTop="?android:attr/actionBarSize" />
+ android:layout_height="match_parent" />
diff --git a/res/layout-sw600dp/bookmarks_history.xml b/res/menu-sw600dp/combined.xml
similarity index 65%
copy from res/layout-sw600dp/bookmarks_history.xml
copy to res/menu-sw600dp/combined.xml
index ae5e19b..97abc8d 100644
--- a/res/layout-sw600dp/bookmarks_history.xml
+++ b/res/menu-sw600dp/combined.xml
@@ -13,9 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/bg_browser" />
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/preferences_menu_id"
+ android:title="@string/menu_preferences"
+ android:icon="@drawable/ic_settings_holo_dark"
+ android:alphabeticShortcut="p"
+ android:showAsAction="ifRoom"
+ android:orderInCategory="1000" />
+</menu>
diff --git a/res/layout-sw600dp/bookmarks_history.xml b/res/menu-sw600dp/history.xml
similarity index 67%
copy from res/layout-sw600dp/bookmarks_history.xml
copy to res/menu-sw600dp/history.xml
index ae5e19b..36ae6e4 100644
--- a/res/layout-sw600dp/bookmarks_history.xml
+++ b/res/menu-sw600dp/history.xml
@@ -13,9 +13,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/bg_browser" />
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:id="@+id/clear_history_menu_id"
+ android:title="@string/clear_history"
+ android:icon="@android:drawable/ic_menu_close_clear_cancel"
+ android:showAsAction="ifRoom"
+ android:orderInCategory="1" />
+</menu>
diff --git a/res/menu-w500dp/bookmark.xml b/res/menu-w500dp/bookmark.xml
deleted file mode 100644
index a951373..0000000
--- a/res/menu-w500dp/bookmark.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/add_bookmark"
- android:icon="@drawable/ic_bookmark_off_holo_dark"
- android:title="@string/add_new_bookmark"
- android:showAsAction="always" />
- <item
- android:id="@+id/go_home"
- android:icon="@drawable/ic_home_holo_dark"
- android:showAsAction="always" />
- <item
- android:id="@+id/thumbnail_view"
- android:title="@string/bookmark_thumbnail_view"
- android:icon="@drawable/ic_thumbnail_view_holo_dark" />
- <item
- android:id="@+id/list_view"
- android:title="@string/bookmark_list_view"
- android:icon="@drawable/ic_list_view_holo_dark" />
- <item
- android:id="@+id/preferences_menu_id"
- android:title="@string/menu_preferences"
- android:icon="@drawable/ic_settings_holo_dark"
- android:alphabeticShortcut="p" />
-</menu>
diff --git a/res/menu-w720dp/bookmark.xml b/res/menu-w720dp/bookmark.xml
deleted file mode 100644
index 0adadac..0000000
--- a/res/menu-w720dp/bookmark.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/add_bookmark"
- android:icon="@drawable/ic_bookmark_off_holo_dark"
- android:title="@string/add_new_bookmark"
- android:showAsAction="always|withText" />
- <item
- android:id="@+id/go_home"
- android:icon="@drawable/ic_home_holo_dark"
- android:showAsAction="always" />
- <item
- android:id="@+id/thumbnail_view"
- android:title="@string/bookmark_thumbnail_view"/>
- <item
- android:id="@+id/list_view"
- android:title="@string/bookmark_list_view"/>
- <item
- android:id="@+id/preferences_menu_id"
- android:title="@string/menu_preferences"
- android:alphabeticShortcut="p" />
-</menu>
diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml
deleted file mode 100644
index eee1706..0000000
--- a/res/menu/bookmark.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/add_bookmark"
- android:icon="@drawable/ic_bookmark_off_holo_dark"
- android:title="@string/add_new_bookmark" />
- <item
- android:id="@+id/go_home"
- android:title="@string/go_home"
- android:icon="@drawable/ic_home_holo_dark" />
- <item
- android:id="@+id/thumbnail_view"
- android:title="@string/bookmark_thumbnail_view"
- android:icon="@drawable/ic_thumbnail_view_holo_dark" />
- <item
- android:id="@+id/list_view"
- android:title="@string/bookmark_list_view"
- android:icon="@drawable/ic_list_view_holo_dark" />
- <item
- android:id="@+id/preferences_menu_id"
- android:title="@string/menu_preferences"
- android:icon="@drawable/ic_settings_holo_dark"
- android:alphabeticShortcut="p" />
-</menu>
diff --git a/res/layout-sw600dp/bookmarks_history.xml b/res/menu/combined.xml
similarity index 73%
rename from res/layout-sw600dp/bookmarks_history.xml
rename to res/menu/combined.xml
index ae5e19b..559bb74 100644
--- a/res/layout-sw600dp/bookmarks_history.xml
+++ b/res/menu/combined.xml
@@ -13,9 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/bg_browser" />
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+</menu>
diff --git a/res/menu/history.xml b/res/menu/history.xml
index 5b029b5..a8c1b29 100644
--- a/res/menu/history.xml
+++ b/res/menu/history.xml
@@ -4,9 +4,9 @@
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.
@@ -15,11 +15,4 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/clear_history_menu_id"
- android:title="@string/clear_history"
- android:icon="@android:drawable/ic_menu_close_clear_cancel" />
- <item android:id="@+id/preferences_menu_id"
- android:title="@string/menu_preferences"
- android:icon="@drawable/ic_settings_holo_dark"
- android:alphabeticShortcut="p" />
</menu>
