summaryrefslogtreecommitdiffstats
path: root/res/menu
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-08-05 14:29:28 -0500
committerJeff Hamilton <jham@android.com>2010-08-16 11:07:27 -0500
commit8402962ef58546d3cfd48fbb211b5e36df0f118e (patch)
tree2d8a10b9426760ea11e4f0288850a41eadcb931b /res/menu
parented217745066c160f785626e9a15ebe70af5e25e4 (diff)
downloadpackages_apps_browser-8402962ef58546d3cfd48fbb211b5e36df0f118e.zip
packages_apps_browser-8402962ef58546d3cfd48fbb211b5e36df0f118e.tar.gz
packages_apps_browser-8402962ef58546d3cfd48fbb211b5e36df0f118e.tar.bz2
First revision of the new browser provider.
This one has support for bookmarks sync, has the bookmarks and history in separate tables, and supports hierarchical bookmarks. Compatibility with the old APIs is not yet complete. The Bookmarks UI has been switched over to the new provider. Creating bookmarks puts them in the UIs root folder. Change-Id: Ib21713ddd19f43d178d49dbac977f749e7103368
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/bookmarks.xml23
-rw-r--r--res/menu/bookmarkscontext.xml4
2 files changed, 0 insertions, 27 deletions
diff --git a/res/menu/bookmarks.xml b/res/menu/bookmarks.xml
deleted file mode 100644
index a8781c2..0000000
--- a/res/menu/bookmarks.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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/new_context_menu_id"
- android:icon="@drawable/ic_menu_add_bookmark"
- android:title="@string/bookmark_page" />
- <item android:id="@+id/switch_mode_menu_id"
- />
-</menu>
diff --git a/res/menu/bookmarkscontext.xml b/res/menu/bookmarkscontext.xml
index badbb00..c58d459 100644
--- a/res/menu/bookmarkscontext.xml
+++ b/res/menu/bookmarkscontext.xml
@@ -15,10 +15,6 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <group android:id="@+id/ADD_MENU">
- <item android:id="@+id/new_context_menu_id"
- android:title="@string/save_to_bookmarks"/>
- </group>
<group android:id="@+id/CONTEXT_MENU">
<item android:id="@+id/open_context_menu_id"
android:title="@string/open_bookmark"/>