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/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>