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/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 68144e2..cb1ffc7 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.swe.browser.tests">
+ package="com.android.browser.tests">
<!-- We add an application tag here just so that we can indicate that
this package needs to link against the android.test library,
@@ -28,14 +28,14 @@
<!--
This declares that this app uses the instrumentation test runner targeting
the package of com.android.email. To run the tests use the command:
- "adb shell am instrument -w com.android.swe.browser.tests/android.test.InstrumentationTestRunner"
+ "adb shell am instrument -w com.android.browser.tests/android.test.InstrumentationTestRunner"
-->
<instrumentation android:name="android.test.InstrumentationTestRunner"
- android:targetPackage="com.android.swe.browser"
+ android:targetPackage="com.android.browser"
android:label="Tests for Browser."/>
- <instrumentation android:name="com.android.swe.browser.BrowserLaunchPerformance"
- android:targetPackage="com.android.swe.browser"
+ <instrumentation android:name="com.android.browser.BrowserLaunchPerformance"
+ android:targetPackage="com.android.browser"
android:label="Browser Launch Performance">
</instrumentation>
diff --git a/tests/src/com/android/browser/BrowserLaunchPerformance.java b/tests/src/com/android/browser/BrowserLaunchPerformance.java
index b2d0574..c5d4279 100644
--- a/tests/src/com/android/browser/BrowserLaunchPerformance.java
+++ b/tests/src/com/android/browser/BrowserLaunchPerformance.java
@@ -1,4 +1,4 @@
-package com.android.swe.browser;
+package com.android.browser;
import android.app.Activity;
import android.os.Bundle;
@@ -10,7 +10,7 @@
public void onCreate(Bundle arguments) {
super.onCreate(arguments);
- mIntent.setClassName(getTargetContext(), "com.android.swe.browser.BrowserActivity");
+ mIntent.setClassName(getTargetContext(), "com.android.browser.BrowserActivity");
start();
}
diff --git a/tests/src/com/android/browser/BrowserProviderTests.java b/tests/src/com/android/browser/BrowserProviderTests.java
index 00b7031..c63cad1 100644
--- a/tests/src/com/android/browser/BrowserProviderTests.java
+++ b/tests/src/com/android/browser/BrowserProviderTests.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
-import com.android.swe.browser.provider.BrowserProvider;
-import com.android.swe.browser.provider.BrowserProvider2;
-import com.android.swe.browser.tests.utils.ProviderTestCase3;
+import com.android.browser.provider.BrowserProvider;
+import com.android.browser.provider.BrowserProvider2;
+import com.android.browser.tests.utils.ProviderTestCase3;
import android.app.SearchManager;
import android.content.ContentValues;
diff --git a/tests/src/com/android/browser/IntentHandlerTests.java b/tests/src/com/android/browser/IntentHandlerTests.java
index f870363..50cf502 100644
--- a/tests/src/com/android/browser/IntentHandlerTests.java
+++ b/tests/src/com/android/browser/IntentHandlerTests.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
import android.app.Activity;
import android.content.Intent;
diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java
index 8e46f5d..908ee68 100644
--- a/tests/src/com/android/browser/PopularUrlsTest.java
+++ b/tests/src/com/android/browser/PopularUrlsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
import android.app.Instrumentation;
import android.content.Intent;
diff --git a/tests/src/com/android/browser/TestWebChromeClient.java b/tests/src/com/android/browser/TestWebChromeClient.java
index 0b818ae..f10452f 100644
--- a/tests/src/com/android/browser/TestWebChromeClient.java
+++ b/tests/src/com/android/browser/TestWebChromeClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
import android.graphics.Bitmap;
import android.net.Uri;
diff --git a/tests/src/com/android/browser/TestWebViewClient.java b/tests/src/com/android/browser/TestWebViewClient.java
index 33a1eb6..7b77448 100644
--- a/tests/src/com/android/browser/TestWebViewClient.java
+++ b/tests/src/com/android/browser/TestWebViewClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
import android.graphics.Bitmap;
import android.net.http.SslError;
diff --git a/tests/src/com/android/browser/WebStorageSizeManagerUnitTests.java b/tests/src/com/android/browser/WebStorageSizeManagerUnitTests.java
index 24d3f61..2beedf8 100644
--- a/tests/src/com/android/browser/WebStorageSizeManagerUnitTests.java
+++ b/tests/src/com/android/browser/WebStorageSizeManagerUnitTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser;
+package com.android.browser;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
diff --git a/tests/src/com/android/browser/tests/BP1to2UpgradeTests.java b/tests/src/com/android/browser/tests/BP1to2UpgradeTests.java
index 6a3c5e2..ea5cfaa 100644
--- a/tests/src/com/android/browser/tests/BP1to2UpgradeTests.java
+++ b/tests/src/com/android/browser/tests/BP1to2UpgradeTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests;
+package com.android.browser.tests;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -25,13 +25,13 @@
import android.provider.Browser;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.swe.browser.platformsupport.BookmarkColumns;
-import com.android.swe.browser.platformsupport.BrowserContract;
-import com.android.swe.browser.platformsupport.BrowserContract.Bookmarks;
-import com.android.swe.browser.platformsupport.BrowserContract.History;
-import com.android.swe.browser.platformsupport.BrowserContract.Images;
-import com.android.swe.browser.provider.BrowserProvider;
-import com.android.swe.browser.tests.utils.BP2TestCaseHelper;
+import com.android.browser.platformsupport.BookmarkColumns;
+import com.android.browser.platformsupport.BrowserContract;
+import com.android.browser.platformsupport.BrowserContract.Bookmarks;
+import com.android.browser.platformsupport.BrowserContract.History;
+import com.android.browser.platformsupport.BrowserContract.Images;
+import com.android.browser.provider.BrowserProvider;
+import com.android.browser.tests.utils.BP2TestCaseHelper;
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
diff --git a/tests/src/com/android/browser/tests/BP2ProviderTests.java b/tests/src/com/android/browser/tests/BP2ProviderTests.java
index c05a953..23b75d0 100644
--- a/tests/src/com/android/browser/tests/BP2ProviderTests.java
+++ b/tests/src/com/android/browser/tests/BP2ProviderTests.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests;
+package com.android.browser.tests;
-import com.android.swe.browser.tests.utils.BP2TestCaseHelper;
+import com.android.browser.tests.utils.BP2TestCaseHelper;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -26,8 +26,8 @@
import android.net.Uri;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.swe.browser.platformsupport.BrowserContract;
-import com.android.swe.browser.platformsupport.BrowserContract.Images;
+import com.android.browser.platformsupport.BrowserContract;
+import com.android.browser.platformsupport.BrowserContract.Images;
import java.io.ByteArrayOutputStream;
diff --git a/tests/src/com/android/browser/tests/BP2UriObserverTests.java b/tests/src/com/android/browser/tests/BP2UriObserverTests.java
index f065cfd..a3b001a 100644
--- a/tests/src/com/android/browser/tests/BP2UriObserverTests.java
+++ b/tests/src/com/android/browser/tests/BP2UriObserverTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests;
+package com.android.browser.tests;
import android.content.ContentValues;
import android.graphics.Bitmap;
@@ -22,9 +22,9 @@
import android.net.Uri;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.swe.browser.platformsupport.BrowserContract.Bookmarks;
-import com.android.swe.browser.platformsupport.BrowserContract.History;
-import com.android.swe.browser.tests.utils.BP2TestCaseHelper;
+import com.android.browser.platformsupport.BrowserContract.Bookmarks;
+import com.android.browser.platformsupport.BrowserContract.History;
+import com.android.browser.tests.utils.BP2TestCaseHelper;
import java.io.ByteArrayOutputStream;
diff --git a/tests/src/com/android/browser/tests/BookmarksTests.java b/tests/src/com/android/browser/tests/BookmarksTests.java
index 9ca3413..f4b9109 100644
--- a/tests/src/com/android/browser/tests/BookmarksTests.java
+++ b/tests/src/com/android/browser/tests/BookmarksTests.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests;
+package com.android.browser.tests;
import android.content.ContentResolver;
import android.database.Cursor;
import android.test.suitebuilder.annotation.SmallTest;
-import com.android.swe.browser.Bookmarks;
-import com.android.swe.browser.tests.utils.BP2TestCaseHelper;
+import com.android.browser.Bookmarks;
+import com.android.browser.tests.utils.BP2TestCaseHelper;
/**
* Extends from BP2TestCaseHelper for the helper methods
diff --git a/tests/src/com/android/browser/tests/utils/BP2TestCaseHelper.java b/tests/src/com/android/browser/tests/utils/BP2TestCaseHelper.java
index b20d1f0..9133a87 100644
--- a/tests/src/com/android/browser/tests/utils/BP2TestCaseHelper.java
+++ b/tests/src/com/android/browser/tests/utils/BP2TestCaseHelper.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests.utils;
+package com.android.browser.tests.utils;
-import com.android.swe.browser.provider.BrowserProvider2;
+import com.android.browser.provider.BrowserProvider2;
import java.io.File;
import java.io.FilenameFilter;
@@ -27,9 +27,9 @@
import android.provider.Browser;
import android.util.Log;
-import com.android.swe.browser.platformsupport.BrowserContract;
-import com.android.swe.browser.platformsupport.BrowserContract.Bookmarks;
-import com.android.swe.browser.platformsupport.BrowserContract.History;
+import com.android.browser.platformsupport.BrowserContract;
+import com.android.browser.platformsupport.BrowserContract.Bookmarks;
+import com.android.browser.platformsupport.BrowserContract.History;
/**
* This is a replacement for ProviderTestCase2 that can handle notifyChange testing.
diff --git a/tests/src/com/android/browser/tests/utils/MockContentResolver2.java b/tests/src/com/android/browser/tests/utils/MockContentResolver2.java
index 2d50a2c..4fed65a 100644
--- a/tests/src/com/android/browser/tests/utils/MockContentResolver2.java
+++ b/tests/src/com/android/browser/tests/utils/MockContentResolver2.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests.utils;
+package com.android.browser.tests.utils;
import com.google.android.collect.Maps;
diff --git a/tests/src/com/android/browser/tests/utils/MockObserverNode.java b/tests/src/com/android/browser/tests/utils/MockObserverNode.java
index e000859..edcffd4 100644
--- a/tests/src/com/android/browser/tests/utils/MockObserverNode.java
+++ b/tests/src/com/android/browser/tests/utils/MockObserverNode.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests.utils;
+package com.android.browser.tests.utils;
import android.database.ContentObserver;
import android.net.Uri;
diff --git a/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java b/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java
index 5eedd3b..75bc052 100644
--- a/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java
+++ b/tests/src/com/android/browser/tests/utils/ProviderTestCase3.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.swe.browser.tests.utils;
+package com.android.browser.tests.utils;
import android.content.ContentProvider;
import android.content.Context;
@@ -102,7 +102,7 @@
* Sets up the environment for the test fixture.
* <p>
* Creates a new
- * {@link com.android.swe.browser.tests.utils.MockContentResolver2}, a new IsolatedContext
+ * {@link com.android.browser.tests.utils.MockContentResolver2}, a new IsolatedContext
* that isolates the provider's file operations, and a new instance of
* the provider under test within the isolated environment.
* </p>