Added modified files to consume SWE
Change-Id: I959781dad2a983de6be6ab07f418006a5708c976
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index fdadd6a..eb26fe4 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/browser_background_holo">
- <com.android.browser.NavTabScroller
+ <com.android.swe.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout-sw600dp/pick_bookmark.xml b/res/layout-sw600dp/pick_bookmark.xml
index b35dbb9..a6fced4 100644
--- a/res/layout-sw600dp/pick_bookmark.xml
+++ b/res/layout-sw600dp/pick_bookmark.xml
@@ -22,7 +22,7 @@
android:showDividers="middle"
android:dividerPadding="16dip">
- <fragment class="com.android.browser.BrowserBookmarksPage"
+ <fragment class="com.android.swe.browser.BrowserBookmarksPage"
android:id="@+id/bookmarks"
android:layout_width="match_parent"
android:layout_height="0dip"
diff --git a/res/layout-sw600dp/title_bar_autologin.xml b/res/layout-sw600dp/title_bar_autologin.xml
index 1065756..a6955dc 100644
--- a/res/layout-sw600dp/title_bar_autologin.xml
+++ b/res/layout-sw600dp/title_bar_autologin.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.AutologinBar
+<com.android.swe.browser.AutologinBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -66,4 +66,4 @@
android:paddingRight="15dip"
android:background="@null"
android:src="@*android:drawable/btn_close"/>
-</com.android.browser.AutologinBar>
+</com.android.swe.browser.AutologinBar>
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index a6b8a32..450029e 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.NavigationBarTablet
+<com.android.swe.browser.NavigationBarTablet
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:background="@drawable/bg_urlbar">
@@ -67,7 +67,7 @@
android:layout_marginLeft="0dip"
style="@style/HoloIcon"
android:visibility="gone" />
- <com.android.browser.UrlInputView
+ <com.android.swe.browser.UrlInputView
android:id="@+id/url"
android:layout_width="0dip"
android:layout_weight="1.0"
@@ -122,4 +122,4 @@
style="@style/HoloButton"
android:contentDescription="@string/accessibility_button_bookmarks"
android:src="@drawable/ic_bookmarks_history_holo_dark" />
-</com.android.browser.NavigationBarTablet>
+</com.android.swe.browser.NavigationBarTablet>
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index a2cc9d0..252902c 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.SnapshotBar
+<com.android.swe.browser.SnapshotBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,6 +50,6 @@
android:scaleType="center"
android:paddingRight="16dip"
style="@style/HoloButton"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
+ android:src="@drawable/ic_bookmarks_history_holo_dark"
android:contentDescription="@string/accessibility_button_bookmarks" />
-</com.android.browser.SnapshotBar>
+</com.android.swe.browser.SnapshotBar>
\ No newline at end of file
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml
index 4425a26..808ef52 100644
--- a/res/layout/bookmark_list.xml
+++ b/res/layout/bookmark_list.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.browser.view.BookmarkContainer
+<com.android.swe.browser.view.BookmarkContainer
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_item"
android:layout_width="match_parent"
@@ -40,4 +40,4 @@
android:maxLines="1"
android:scrollHorizontally="true"
android:ellipsize="marquee"/>
-</com.android.browser.view.BookmarkContainer>
+</com.android.swe.browser.view.BookmarkContainer>
diff --git a/res/layout/bookmark_sync_wizard.xml b/res/layout/bookmark_sync_wizard.xml
index 3a3d9da..f6be517 100644
--- a/res/layout/bookmark_sync_wizard.xml
+++ b/res/layout/bookmark_sync_wizard.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<view class="com.android.browser.view.EventRedirectingFrameLayout"
+<view class="com.android.swe.browser.view.EventRedirectingFrameLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pages"
android:paddingTop="6dip">
diff --git a/res/layout/bookmark_thumbnail.xml b/res/layout/bookmark_thumbnail.xml
index cd7b9be..00ad8ab 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<com.android.browser.view.BookmarkContainer xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.swe.browser.view.BookmarkContainer
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -60,4 +61,4 @@
android:textColor="#AAAAAA"
/>
-</com.android.browser.view.BookmarkContainer>
+</com.android.swe.browser.view.BookmarkContainer>
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 09b442e..59ef131 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/combo_paddingTop">
- <com.android.browser.view.BookmarkExpandableView
+ <com.android.swe.browser.view.BookmarkExpandableView
android:id="@+id/grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/bookmarks_header.xml b/res/layout/bookmarks_header.xml
index ba8cf2c..af53f1a 100644
--- a/res/layout/bookmarks_header.xml
+++ b/res/layout/bookmarks_header.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.browser.BreadCrumbView
+<com.android.swe.browser.BreadCrumbView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/crumbs"
android:layout_width="match_parent"
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 58db8a5..1431abc 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -24,7 +24,7 @@
android:orientation="horizontal"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
>
- <com.android.browser.BreadCrumbView android:id="@+id/crumbs"
+ <com.android.swe.browser.BreadCrumbView android:id="@+id/crumbs"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="match_parent" />
@@ -160,7 +160,7 @@
android:text="@string/containing_folder"
android:textAppearance="?android:attr/textAppearanceMedium" />
- <view class="com.android.browser.addbookmark.FolderSpinner"
+ <view class="com.android.swe.browser.addbookmark.FolderSpinner"
android:id="@+id/folder"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -178,7 +178,7 @@
android:visibility="gone"
>
- <view class="com.android.browser.AddBookmarkPage$CustomListView"
+ <view class="com.android.swe.browser.AddBookmarkPage$CustomListView"
android:id="@+id/list"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
diff --git a/res/layout/browser_tab_crash.xml b/res/layout/browser_tab_crash.xml
index 4144d87..d5ad343 100644
--- a/res/layout/browser_tab_crash.xml
+++ b/res/layout/browser_tab_crash.xml
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@android:color/holo_green_dark"
- android:text="Reload"/>
+ android:text="@string/browser_tab_crash_reload"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml
index 61c455c..6fc2873 100644
--- a/res/layout/custom_screen.xml
+++ b/res/layout/custom_screen.xml
@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
- <com.android.browser.view.CustomScreenLinearLayout
+ <com.android.swe.browser.view.CustomScreenLinearLayout
android:orientation="vertical"
android:id="@+id/vertical_layout"
android:layout_width="match_parent"
@@ -42,6 +42,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
- </com.android.browser.view.CustomScreenLinearLayout>
+ </com.android.swe.browser.view.CustomScreenLinearLayout>
</merge>
diff --git a/res/layout/error_console.xml b/res/layout/error_console.xml
index e239622..35e33cb 100644
--- a/res/layout/error_console.xml
+++ b/res/layout/error_console.xml
@@ -33,7 +33,7 @@
android:visibility="gone"
/>
- <view class="com.android.browser.ErrorConsoleView$ErrorConsoleListView"
+ <view class="com.android.swe.browser.ErrorConsoleView$ErrorConsoleListView"
android:id="@+id/error_console_list_id"
android:layout_width="match_parent"
android:layout_height="200dip"
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index 1920c05..83df143 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -16,7 +16,7 @@
This is the layout for the Geolocation permissions prompt.
-->
-<com.android.browser.GeolocationPermissionsPrompt
+<com.android.swe.browser.GeolocationPermissionsPrompt
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -81,4 +81,4 @@
</LinearLayout>
</LinearLayout>
-</com.android.browser.GeolocationPermissionsPrompt>
+</com.android.swe.browser.GeolocationPermissionsPrompt>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index c655727..b3ececf 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/browser_background_holo">
- <com.android.browser.NavTabScroller
+ <com.android.swe.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/pick_bookmark.xml b/res/layout/pick_bookmark.xml
index 9636c4a..3bc9616 100644
--- a/res/layout/pick_bookmark.xml
+++ b/res/layout/pick_bookmark.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <fragment class="com.android.browser.BrowserBookmarksPage"
+ <fragment class="com.android.swe.browser.BrowserBookmarksPage"
android:id="@+id/bookmarks"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/res/layout/snapshots.xml b/res/layout/snapshots.xml
index a02fbb9..e049aa6 100644
--- a/res/layout/snapshots.xml
+++ b/res/layout/snapshots.xml
@@ -20,7 +20,7 @@
android:layout_height="match_parent"
android:paddingTop="@dimen/combo_paddingTop">
- <com.android.browser.view.SnapshotGridView
+ <com.android.swe.browser.view.SnapshotGridView
android:id="@+id/grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index a9a70fd..4211406 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -17,7 +17,7 @@
android:layout_height="?android:attr/actionBarSize"
android:orientation="horizontal"
>
- <com.android.browser.TabScrollView
+ <com.android.swe.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dip"
android:layout_height="match_parent"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index acc49e6..8fd6865 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -36,7 +36,7 @@
android:layout_below="@id/taburlbar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
- <com.android.browser.PageProgressView
+ <com.android.swe.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/title_bar_autologin.xml b/res/layout/title_bar_autologin.xml
index 22da630..693aec2 100644
--- a/res/layout/title_bar_autologin.xml
+++ b/res/layout/title_bar_autologin.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.AutologinBar
+<com.android.swe.browser.AutologinBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -75,4 +75,4 @@
android:text="@string/autologin_bar_error"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" />
-</com.android.browser.AutologinBar>
+</com.android.swe.browser.AutologinBar>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 2f1e0a2..d47b316 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.NavigationBarPhone
+<com.android.swe.browser.NavigationBarPhone
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:background="@drawable/bg_urlbar">
@@ -71,7 +71,7 @@
android:contentDescription="@string/accessibility_button_stop"
android:src="@drawable/ic_stop_holo_dark"
style="@style/HoloButton" />
- <com.android.browser.UrlInputView
+ <com.android.swe.browser.UrlInputView
android:id="@+id/url"
android:focusable="true"
android:layout_width="0dip"
@@ -123,4 +123,4 @@
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_more"
android:src="@drawable/ic_menu_overflow" />
-</com.android.browser.NavigationBarPhone>
+</com.android.swe.browser.NavigationBarPhone>
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index 0e2ab1c..004716b 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.SnapshotBar
+<com.android.swe.browser.SnapshotBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -67,4 +67,4 @@
android:gravity="center_vertical"
android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark"
android:contentDescription="@string/accessibility_button_more" />
-</com.android.browser.SnapshotBar>
+</com.android.swe.browser.SnapshotBar>
diff --git a/res/layout/webview_preview.xml b/res/layout/webview_preview.xml
index 8f8d810..f0acf45 100644
--- a/res/layout/webview_preview.xml
+++ b/res/layout/webview_preview.xml
@@ -72,7 +72,7 @@
android:gravity="center"
android:orientation="vertical" />
- <WebView
+ <org.codeaurora.swe.WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="180dp"
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 9578026..22ad532 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -65,7 +65,7 @@
android:alphabeticShortcut="s" />
<item
android:id="@+id/find_menu_id"
- android:title="@*android:string/find_on_page"/>
+ android:title="@string/find_on_page"/>
<item
android:id="@+id/ua_desktop_menu_id"
android:checkable="true"
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
index 4f9377f..47f21f4 100644
--- a/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_browser.png b/res/mipmap-mdpi/ic_launcher_browser.png
index 9bc6817..ed2fc3b 100644
--- a/res/mipmap-mdpi/ic_launcher_browser.png
+++ b/res/mipmap-mdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_browser.png b/res/mipmap-xhdpi/ic_launcher_browser.png
index 9412fbe..c712cd6 100644
--- a/res/mipmap-xhdpi/ic_launcher_browser.png
+++ b/res/mipmap-xhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_browser.png b/res/mipmap-xxhdpi/ic_launcher_browser.png
index bd8c447..516d7be 100644
--- a/res/mipmap-xxhdpi/ic_launcher_browser.png
+++ b/res/mipmap-xxhdpi/ic_launcher_browser.png
Binary files differ
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 3cd8700..7cffaf9 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -133,6 +133,7 @@
<string name="pref_content_load_images_summary" msgid="5055874125248398584">"Display images on web pages"</string>
<string name="pref_content_block_popups" msgid="4158524847764470895">"Block pop-ups"</string>
<string name="pref_content_javascript" msgid="4570972030299516843">"Enable JavaScript"</string>
+ <string name="pref_memory_monitor" msgid="4570972030299516845">"Enable Memory Monitor"</string>
<string name="pref_content_open_in_background" msgid="824123779725118663">"Open in background"</string>
<string name="pref_content_plugins" msgid="7231944644794301582">"Enable plug-ins"</string>
<string-array name="pref_content_plugins_choices">
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 3c20f9a..cc8ff5a 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -14,7 +14,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<bool name="isTablet">false</bool>
<!-- hide the title bar -->
- <bool name="hide_title">true</bool>
+ <bool name="hide_title">false</bool>
<bool name="hide_nav_buttons">true</bool>
<!-- Browser menu toggles -->
<bool name="menu_show_navigation">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3db6ea7..7227c07 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,18 +4,21 @@
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.
-->
+<!DOCTYPE resources [
+ <!ENTITY about SYSTEM "about.xml">
+]>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the application. -->
- <string name="application_name">Browser</string>
+ <string name="application_name">SWE Browser</string>
<!-- Displayed with a file picker to choose a file to upload -->
<string name="choose_upload">Choose file for upload</string>
<!-- Toast to show the user after they try to open the file picker but no apps on the
@@ -23,6 +26,15 @@
<string name="uploads_disabled">File uploads are disabled.</string>
<!-- Name of menu item of a new tab. Also used in the title bar when displaying a new tab -->
<string name="new_tab">New tab</string>
+ <!-- Crash tab View title -->
+ <string name="browser_tab_crash_snap">Oops, Snap !</string>
+ <!-- Crash tab button text -->
+ <string name="browser_tab_crash_reload">Reload</string>
+ <!-- Crash tab View message -->
+ <string name="browser_tab_crash_message">
+ Something unexpected happened when displaying this webpage.
+ Please reload or go to another page.
+ </string>
<!-- Name of menu item of a new incognito tab. Also used in the
title bar when displaying a new tab [CHAR LIMIT=30] -->
<string name="new_incognito_tab">New incognito tab</string>
@@ -175,7 +187,7 @@
<string name="bookmark_cannot_save_url">This URL can\'t be bookmarked.</string>
<!-- Menu item in the page that displays all bookmarks. It brings up a
dialog that allows the user to bookmark the page that the browser is
- currently on, but is not visible because the bookmarks page is
+ currently on, but is not visible because the bookmarks page is
showing. -->
<string name="bookmark_page">Bookmark last-viewed page</string>
<!-- Menu item in the page that displays all bookmarks. Switches to
@@ -265,7 +277,7 @@
<!-- Context Menu item to show the currently selected address in the Maps
application -->
<string name="contextmenu_map">Map</string>
-
+
<!-- Title of the dialog used for selecting the application that should be
used for sharing a link (e.g. Gmail or another app). See also
contextmenu_sharelink above -->
@@ -299,6 +311,8 @@
<!-- Settings label -->
<string name="pref_content_javascript">Enable JavaScript</string>
<!-- Settings label -->
+ <string name="pref_memory_monitor">Enable Memory Monitor</string>
+ <!-- Settings label -->
<string name="pref_content_open_in_background">Open in background</string>
<!-- Settings label -->
<string name="pref_content_plugins">Enable plug-ins</string>
@@ -722,7 +736,7 @@
<!-- Verb placed in front of a screenshot of a web page that, when clicked,
will add that page to bookmarks -->
<string name="add_bookmark_short">Add</string>
-
+
<!-- This string is for the browser "Go To" UI. -->
<!-- Do not translate. This string is not displayed in UI (no badge is selected for go to). -->
<string name="search_label" translatable="false">Browser</string>
@@ -842,7 +856,7 @@
<string name="webstorage_outofspace_notification_text">Touch to free up space.</string>
<!-- Used in the Browser Settings -->
<string name="webstorage_clear_data_title">Clear stored data</string>
-
+
<!-- Confirmation dialog when the user ask to clear all data for an origin -->
<string name="webstorage_clear_data_dialog_message">Delete all data stored by this website?</string>
<string name="webstorage_clear_data_dialog_ok_button">OK</string>
@@ -956,6 +970,8 @@
<string name="preview">Preview</string>
<!-- Name for the user's unsynced, local bookmarks [CHAR LIMIT=50] -->
<string name="local_bookmarks">Local</string>
+ <!-- allows the user to find on webpage [CHAR LIMIT=None] -->
+ <string name="find_on_page">Find on page</string>
<!-- Popup menu checkbox that allows the user to request the desktop version of a webpage [CHAR LIMIT=50] -->
<string name="ua_switcher_desktop">Request desktop site</string>
<!-- Preload permission label [CHAR LIMIT=40] -->
@@ -1091,4 +1107,7 @@
<!-- Toast message displayed when the full screen received message -->
<string name="received_message_full_screen">Receive a message from: <xliff:g id="FROM">%s</xliff:g>.</string>
<string name="acivity_not_found">Activity Not Found to Handle Intent <xliff:g id="NOACTIVITY">%s</xliff:g>.</string>
-</resources>
+ <!-- SWE Android Browser -->
+ <string name="ssl_certificate">Security certificate</string>
+ <string name="ssl_certificate_is_valid">This certificate is valid.</string>
+</resources>
\ No newline at end of file
diff --git a/res/xml-sw600dp/advanced_preferences.xml b/res/xml-sw600dp/advanced_preferences.xml
index 73f145b..d8724b8 100644
--- a/res/xml-sw600dp/advanced_preferences.xml
+++ b/res/xml-sw600dp/advanced_preferences.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Entries and values in this list are set dynamically. -->
- <com.android.browser.search.SearchEnginePreference
+ <com.android.swe.browser.search.SearchEnginePreference
android:key="search_engine"
android:title="@string/pref_content_search_engine"
android:defaultValue="google"
@@ -36,6 +36,11 @@
android:defaultValue="true"
android:title="@string/pref_content_javascript" />
+ <CheckBoxPreference
+ android:key="enable_memory_monitor"
+ android:defaultValue="true"
+ android:title="@string/pref_memory_monitor" />
+
<ListPreference
android:key="plugin_state"
android:title="@string/pref_content_plugins"
@@ -87,7 +92,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_extras_reset_default_title">
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="reset_default_preferences"
android:title="@string/pref_extras_reset_default"
android:summary="@string/pref_extras_reset_default_summary"
diff --git a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
index 7fdcbef..b1004b6 100644
--- a/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
+++ b/res/xml-sw600dp/bookmarkthumbnailwidget_info.xml
@@ -25,5 +25,5 @@
android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"
android:resizeMode="vertical|horizontal"
- android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
+ android:configure="com.android.swe.browser.widget.BookmarkWidgetConfigure">
</appwidget-provider>
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index 8eca917..d77dd27 100644
--- a/res/xml/accessibility_preferences.xml
+++ b/res/xml/accessibility_preferences.xml
@@ -23,31 +23,31 @@
android:defaultValue="false" />
<PreferenceCategory android:title="@string/pref_font_size_category">
- <com.android.browser.preferences.FontSizePreview
+ <com.android.swe.browser.preferences.FontSizePreview
android:title="@string/preview" />
-
- <com.android.browser.preferences.SeekBarSummaryPreference
+ <com.android.swe.browser.preferences.SeekBarSummaryPreference
android:key="text_zoom"
android:title="@string/pref_text_zoom"
android:defaultValue="10"
android:max="30" />
- <com.android.browser.preferences.SeekBarSummaryPreference
+ <com.android.swe.browser.preferences.SeekBarSummaryPreference
android:key="double_tap_zoom"
android:title="@string/pref_zoom_on_double_tap"
android:defaultValue="5"
android:max="10" />
- <com.android.browser.preferences.SeekBarSummaryPreference
+ <com.android.swe.browser.preferences.SeekBarSummaryPreference
android:key="min_font_size"
android:title="@string/pref_min_font_size"
android:defaultValue="0"
android:max="20" />
-
</PreferenceCategory>
+ <!-- // SWE_TODO: Commenting out inverted rendering settings
<PreferenceCategory android:title="@string/pref_inverted_category">
- <com.android.browser.preferences.InvertedContrastPreview
+
+ <com.android.swe.browser.preferences.InvertedContrastPreview
android:title="@string/preview" />
<CheckBoxPreference
@@ -56,13 +56,13 @@
android:title="@string/pref_inverted"
android:summary="@string/pref_inverted_summary" />
- <com.android.browser.preferences.SeekBarSummaryPreference
+ <com.android.swe.browser.preferences.SeekBarSummaryPreference
android:key="inverted_contrast"
android:title="@string/pref_inverted_contrast"
android:dependency="inverted"
android:defaultValue="0"
android:max="20" />
-
</PreferenceCategory>
+ -->
</PreferenceScreen>
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml
index e292b7d..b4daa4b 100644
--- a/res/xml/advanced_preferences.xml
+++ b/res/xml/advanced_preferences.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Entries and values in this list are set dynamically. -->
- <com.android.browser.search.SearchEnginePreference
+ <com.android.swe.browser.search.SearchEnginePreference
android:key="search_engine"
android:title="@string/pref_content_search_engine"
android:defaultValue="google"
@@ -37,6 +37,11 @@
android:title="@string/pref_content_javascript" />
<CheckBoxPreference
+ android:key="enable_memory_monitor"
+ android:defaultValue="true"
+ android:title="@string/pref_memory_monitor" />
+
+ <CheckBoxPreference
android:key="allow_apptabs"
android:defaultValue="false"
android:title="@string/pref_allow_apptabs" />
@@ -92,7 +97,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_extras_reset_default_title">
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="reset_default_preferences"
android:title="@string/pref_extras_reset_default"
android:summary="@string/pref_extras_reset_default_summary"
diff --git a/res/xml/bookmarkthumbnailwidget_info.xml b/res/xml/bookmarkthumbnailwidget_info.xml
index f8ca797..b4c328e 100644
--- a/res/xml/bookmarkthumbnailwidget_info.xml
+++ b/res/xml/bookmarkthumbnailwidget_info.xml
@@ -25,5 +25,5 @@
android:previewImage="@drawable/browser_widget_preview"
android:initialLayout="@layout/bookmarkthumbnailwidget"
android:resizeMode="vertical|horizontal"
- android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
+ android:configure="com.android.swe.browser.widget.BookmarkWidgetConfigure">
</appwidget-provider>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 6f42d3d..aad8a62 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -16,7 +16,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.browser.preferences.NonformattingListPreference
+ <com.android.swe.browser.preferences.NonformattingListPreference
android:key="homepage_picker"
android:entries="@array/pref_homepage_choices"
android:entryValues="@array/pref_homepage_values"
@@ -30,7 +30,7 @@
/>
<PreferenceScreen
- android:fragment="com.android.browser.AutoFillSettingsFragment"
+ android:fragment="com.android.swe.browser.AutoFillSettingsFragment"
android:key="autofill_profile"
android:title="@string/pref_autofill_profile_editor"
android:summary="@string/pref_autofill_profile_editor_summary" />
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
index 2c80835..484d305 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -16,27 +16,27 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header android:fragment="com.android.browser.preferences.GeneralPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.GeneralPreferencesFragment"
android:title="@string/pref_general_title"
/>
- <header android:fragment="com.android.browser.preferences.PrivacySecurityPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.PrivacySecurityPreferencesFragment"
android:title="@string/pref_privacy_security_title"
/>
- <header android:fragment="com.android.browser.preferences.AccessibilityPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.AccessibilityPreferencesFragment"
android:title="@string/pref_accessibility_title"
/>
- <header android:fragment="com.android.browser.preferences.AdvancedPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.AdvancedPreferencesFragment"
android:title="@string/pref_extras_title"
/>
- <header android:fragment="com.android.browser.preferences.BandwidthPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.BandwidthPreferencesFragment"
android:title="@string/pref_data_title"
/>
- <header android:fragment="com.android.browser.preferences.LabPreferencesFragment"
+ <header android:fragment="com.android.swe.browser.preferences.LabPreferencesFragment"
android:title="@string/pref_lab_title"
/>
diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
index 2633600..dba5514 100644
--- a/res/xml/privacy_security_preferences.xml
+++ b/res/xml/privacy_security_preferences.xml
@@ -17,14 +17,14 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_cache"
android:title="@string/pref_privacy_clear_cache"
android:summary="@string/pref_privacy_clear_cache_summary"
android:dialogMessage="@string/pref_privacy_clear_cache_dlg"
android:dialogIcon="@android:drawable/ic_dialog_alert" />
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_history"
android:title="@string/pref_privacy_clear_history"
android:summary="@string/pref_privacy_clear_history_summary"
@@ -44,7 +44,7 @@
android:title="@string/pref_security_accept_cookies"
android:summary="@string/pref_security_accept_cookies_summary" />
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_cookies"
android:title="@string/pref_privacy_clear_cookies"
android:summary="@string/pref_privacy_clear_cookies_summary"
@@ -59,7 +59,7 @@
android:title="@string/pref_security_save_form_data"
android:summary="@string/pref_security_save_form_data_summary" />
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_form_data"
android:title="@string/pref_privacy_clear_form_data"
android:summary="@string/pref_privacy_clear_form_data_summary"
@@ -74,7 +74,7 @@
android:title="@string/pref_privacy_enable_geolocation"
android:summary="@string/pref_privacy_enable_geolocation_summary" />
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_geolocation_access"
android:dependency="enable_geolocation"
android:title="@string/pref_privacy_clear_geolocation_access"
@@ -90,7 +90,7 @@
android:title="@string/pref_security_remember_passwords"
android:summary="@string/pref_security_remember_passwords_summary" />
- <com.android.browser.BrowserYesNoPreference
+ <com.android.swe.browser.BrowserYesNoPreference
android:key="privacy_clear_passwords"
android:title="@string/pref_privacy_clear_passwords"
android:summary="@string/pref_privacy_clear_passwords_summary"
