Change SWE app properties back to stock Android
- Changed project package name from com.android.swe.browser
back to com.android.browser along with code references to
old package name.
- Changes to AndroidManifest making it conform closer to stock
browser manifest.
- Changed app and apk name back to Browser.
Change-Id: I778ee1d1197bd50bd4a4850eef6d1d7f4ef0ad0b
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index eb26fe4..fdadd6a 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.swe.browser.NavTabScroller
+ <com.android.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 a6fced4..b35dbb9 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.swe.browser.BrowserBookmarksPage"
+ <fragment class="com.android.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 a6955dc..1065756 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.swe.browser.AutologinBar
+<com.android.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.swe.browser.AutologinBar>
+</com.android.browser.AutologinBar>
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 450029e..a6b8a32 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.swe.browser.NavigationBarTablet
+<com.android.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.swe.browser.UrlInputView
+ <com.android.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.swe.browser.NavigationBarTablet>
+</com.android.browser.NavigationBarTablet>
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index 252902c..72e4b2b 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.swe.browser.SnapshotBar
+<com.android.browser.SnapshotBar
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -52,4 +52,4 @@
style="@style/HoloButton"
android:src="@drawable/ic_bookmarks_history_holo_dark"
android:contentDescription="@string/accessibility_button_bookmarks" />
-</com.android.swe.browser.SnapshotBar>
\ No newline at end of file
+</com.android.browser.SnapshotBar>
\ No newline at end of file
diff --git a/res/layout/bookmark_list.xml b/res/layout/bookmark_list.xml
index 808ef52..4425a26 100644
--- a/res/layout/bookmark_list.xml
+++ b/res/layout/bookmark_list.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.swe.browser.view.BookmarkContainer
+<com.android.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.swe.browser.view.BookmarkContainer>
+</com.android.browser.view.BookmarkContainer>
diff --git a/res/layout/bookmark_sync_wizard.xml b/res/layout/bookmark_sync_wizard.xml
index f6be517..3a3d9da 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.swe.browser.view.EventRedirectingFrameLayout"
+<view class="com.android.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 00ad8ab..c7f9651 100644
--- a/res/layout/bookmark_thumbnail.xml
+++ b/res/layout/bookmark_thumbnail.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.swe.browser.view.BookmarkContainer
+<com.android.browser.view.BookmarkContainer
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -61,4 +61,4 @@
android:textColor="#AAAAAA"
/>
-</com.android.swe.browser.view.BookmarkContainer>
+</com.android.browser.view.BookmarkContainer>
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 59ef131..09b442e 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.swe.browser.view.BookmarkExpandableView
+ <com.android.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 af53f1a..ba8cf2c 100644
--- a/res/layout/bookmarks_header.xml
+++ b/res/layout/bookmarks_header.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.swe.browser.BreadCrumbView
+<com.android.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 1431abc..58db8a5 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.swe.browser.BreadCrumbView android:id="@+id/crumbs"
+ <com.android.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.swe.browser.addbookmark.FolderSpinner"
+ <view class="com.android.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.swe.browser.AddBookmarkPage$CustomListView"
+ <view class="com.android.browser.AddBookmarkPage$CustomListView"
android:id="@+id/list"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml
index 6fc2873..61c455c 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.swe.browser.view.CustomScreenLinearLayout
+ <com.android.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.swe.browser.view.CustomScreenLinearLayout>
+ </com.android.browser.view.CustomScreenLinearLayout>
</merge>
diff --git a/res/layout/error_console.xml b/res/layout/error_console.xml
index 35e33cb..e239622 100644
--- a/res/layout/error_console.xml
+++ b/res/layout/error_console.xml
@@ -33,7 +33,7 @@
android:visibility="gone"
/>
- <view class="com.android.swe.browser.ErrorConsoleView$ErrorConsoleListView"
+ <view class="com.android.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 83df143..1920c05 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.swe.browser.GeolocationPermissionsPrompt
+<com.android.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.swe.browser.GeolocationPermissionsPrompt>
+</com.android.browser.GeolocationPermissionsPrompt>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index b3ececf..c655727 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.swe.browser.NavTabScroller
+ <com.android.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 3bc9616..9636c4a 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.swe.browser.BrowserBookmarksPage"
+ <fragment class="com.android.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 e049aa6..a02fbb9 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.swe.browser.view.SnapshotGridView
+ <com.android.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 4211406..a9a70fd 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.swe.browser.TabScrollView
+ <com.android.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 8fd6865..acc49e6 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.swe.browser.PageProgressView
+ <com.android.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 693aec2..22da630 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.swe.browser.AutologinBar
+<com.android.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.swe.browser.AutologinBar>
+</com.android.browser.AutologinBar>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index d47b316..2f1e0a2 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.swe.browser.NavigationBarPhone
+<com.android.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.swe.browser.UrlInputView
+ <com.android.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.swe.browser.NavigationBarPhone>
+</com.android.browser.NavigationBarPhone>
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index 004716b..0e2ab1c 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.swe.browser.SnapshotBar
+<com.android.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.swe.browser.SnapshotBar>
+</com.android.browser.SnapshotBar>
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
index 47f21f4..4f9377f 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 ed2fc3b..9bc6817 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 c712cd6..9412fbe 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 516d7be..bd8c447 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/strings.xml b/res/values/strings.xml
index 4a02a1c..ad4d378 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,7 @@
]>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the application. -->
- <string name="application_name">SWE Browser</string>
+ <string name="application_name">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
diff --git a/res/xml-sw600dp/advanced_preferences.xml b/res/xml-sw600dp/advanced_preferences.xml
index d8724b8..359386f 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.swe.browser.search.SearchEnginePreference
+ <com.android.browser.search.SearchEnginePreference
android:key="search_engine"
android:title="@string/pref_content_search_engine"
android:defaultValue="google"
@@ -92,7 +92,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_extras_reset_default_title">
- <com.android.swe.browser.BrowserYesNoPreference
+ <com.android.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 b1004b6..7fdcbef 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.swe.browser.widget.BookmarkWidgetConfigure">
+ android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
</appwidget-provider>
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index d77dd27..3c53026 100644
--- a/res/xml/accessibility_preferences.xml
+++ b/res/xml/accessibility_preferences.xml
@@ -23,21 +23,21 @@
android:defaultValue="false" />
<PreferenceCategory android:title="@string/pref_font_size_category">
- <com.android.swe.browser.preferences.FontSizePreview
+ <com.android.browser.preferences.FontSizePreview
android:title="@string/preview" />
- <com.android.swe.browser.preferences.SeekBarSummaryPreference
+ <com.android.browser.preferences.SeekBarSummaryPreference
android:key="text_zoom"
android:title="@string/pref_text_zoom"
android:defaultValue="10"
android:max="30" />
- <com.android.swe.browser.preferences.SeekBarSummaryPreference
+ <com.android.browser.preferences.SeekBarSummaryPreference
android:key="double_tap_zoom"
android:title="@string/pref_zoom_on_double_tap"
android:defaultValue="5"
android:max="10" />
- <com.android.swe.browser.preferences.SeekBarSummaryPreference
+ <com.android.browser.preferences.SeekBarSummaryPreference
android:key="min_font_size"
android:title="@string/pref_min_font_size"
android:defaultValue="0"
@@ -47,7 +47,7 @@
<!-- // SWE_TODO: Commenting out inverted rendering settings
<PreferenceCategory android:title="@string/pref_inverted_category">
- <com.android.swe.browser.preferences.InvertedContrastPreview
+ <com.android.browser.preferences.InvertedContrastPreview
android:title="@string/preview" />
<CheckBoxPreference
@@ -56,7 +56,7 @@
android:title="@string/pref_inverted"
android:summary="@string/pref_inverted_summary" />
- <com.android.swe.browser.preferences.SeekBarSummaryPreference
+ <com.android.browser.preferences.SeekBarSummaryPreference
android:key="inverted_contrast"
android:title="@string/pref_inverted_contrast"
android:dependency="inverted"
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml
index b4daa4b..333883a 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.swe.browser.search.SearchEnginePreference
+ <com.android.browser.search.SearchEnginePreference
android:key="search_engine"
android:title="@string/pref_content_search_engine"
android:defaultValue="google"
@@ -97,7 +97,7 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_extras_reset_default_title">
- <com.android.swe.browser.BrowserYesNoPreference
+ <com.android.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 b4c328e..f8ca797 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.swe.browser.widget.BookmarkWidgetConfigure">
+ android:configure="com.android.browser.widget.BookmarkWidgetConfigure">
</appwidget-provider>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index aad8a62..6f42d3d 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.swe.browser.preferences.NonformattingListPreference
+ <com.android.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.swe.browser.AutoFillSettingsFragment"
+ android:fragment="com.android.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 244a270..76483d1 100644
--- a/res/xml/preference_headers.xml
+++ b/res/xml/preference_headers.xml
@@ -16,31 +16,31 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
- <header android:fragment="com.android.swe.browser.preferences.GeneralPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.GeneralPreferencesFragment"
android:title="@string/pref_general_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.PrivacySecurityPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.PrivacySecurityPreferencesFragment"
android:title="@string/pref_privacy_security_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.AccessibilityPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.AccessibilityPreferencesFragment"
android:title="@string/pref_accessibility_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.AdvancedPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.AdvancedPreferencesFragment"
android:title="@string/pref_extras_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.BandwidthPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.BandwidthPreferencesFragment"
android:title="@string/pref_data_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.LabPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.LabPreferencesFragment"
android:title="@string/pref_lab_title"
/>
- <header android:fragment="com.android.swe.browser.preferences.AboutPreferencesFragment"
+ <header android:fragment="com.android.browser.preferences.AboutPreferencesFragment"
android:title="@string/version"
/>
diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml
index dba5514..2633600 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.swe.browser.BrowserYesNoPreference
+ <com.android.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.swe.browser.BrowserYesNoPreference
+ <com.android.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.swe.browser.BrowserYesNoPreference
+ <com.android.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.swe.browser.BrowserYesNoPreference
+ <com.android.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.swe.browser.BrowserYesNoPreference
+ <com.android.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.swe.browser.BrowserYesNoPreference
+ <com.android.browser.BrowserYesNoPreference
android:key="privacy_clear_passwords"
android:title="@string/pref_privacy_clear_passwords"
android:summary="@string/pref_privacy_clear_passwords_summary"
