Merge change 8566
* changes:
First real cut of bookmarks backup agent
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c0eba8b..f3707d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,8 +28,8 @@
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK"/>
- <uses-permission android:name="android.permission.READ_HISTORY_BOOKMARKS"/>
- <uses-permission android:name="android.permission.WRITE_HISTORY_BOOKMARKS"/>
+ <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
+ <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
<application android:name="Browser"
android:label="@string/application_name"
@@ -40,8 +40,8 @@
<provider android:name="BrowserProvider"
android:authorities="browser"
android:multiprocess="true"
- android:readPermission="android.permission.READ_HISTORY_BOOKMARKS"
- android:writePermission="android.permission.WRITE_HISTORY_BOOKMARKS">
+ android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
+ android:writePermission="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS">
<path-permission android:path="/bookmarks/search_suggest_query"
android:readPermission="android.permission.GLOBAL_SEARCH" />
</provider>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d1c229..f2220c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -401,7 +401,7 @@
<!-- Settings summary -->
<string name="pref_extras_gears_enable_summary">Applications that extend browser functionality</string>
<!-- Settings label -->
- <string name="pref_extras_website_settings">Website Settings</string>
+ <string name="pref_extras_website_settings">Website settings</string>
<!-- Settings summary -->
<string name="pref_extras_website_settings_summary">View advanced settings for individual websites</string>
<!-- Settings label -->
@@ -768,11 +768,11 @@
<!-- Used as a toast notification after the user close the html5 webstorage permission dialog -->
<string name="webstorage_notification">The quota for this site can be changed in the Local Storage section of the Browser settings</string>
<!-- Used in the Browser Settings -->
- <string name="webstorage_clear_data_title">Clear Stored Data</string>
+ <string name="webstorage_clear_data_title">Clear stored data</string>
<string name="webstorage_clear_data_summary">Remove all databases associated with this website</string>
<!-- Confirmation dialog when the user ask to clear all data for an origin -->
- <string name="webstorage_clear_data_dialog_title">Clear All Data</string>
- <string name="webstorage_clear_data_dialog_message">All stored data by this origin will be deleted</string>
+ <string name="webstorage_clear_data_dialog_title">Clear stored data</string>
+ <string name="webstorage_clear_data_dialog_message">All data stored by this website will be deleted</string>
<string name="webstorage_clear_data_dialog_ok_button">Clear All</string>
<string name="webstorage_clear_data_dialog_cancel_button">Cancel</string>
<!-- Strings used in the summary of origins -->