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

6 files changed, 24 insertions, 24 deletions

diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml
index d77dd278..3c530261 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 b4daa4b6..333883a4 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 b4c328e0..f8ca797c 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 aad8a62f..6f42d3d7 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 244a270b..76483d15 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 dba55149..26336000 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"