commit ef749cb6a1709ea411222b3c035bbd9271e87b35
author Tarun Nainani <tnainani@codeaurora.org> Mon May 19 18:16:53 2014 -0700
committer Tarun Nainani <tnainani@codeaurora.org> Wed May 21 13:31:55 2014 -0700
tree 77953a60eb02502a332ddbd0a38ac8cfa45a1035
parent e75909d7f96ab75c64be108f48a9bcc0934ae070

Fixes for 1599-qrd browser to work with 1857 swe engine

Fix provider issue by providing custom class with authority string.
Comment out clear password feature.

Change-Id: Icab6cf7d3bbd71a14fad337ef01f0c53fcaf2fdf

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 000cf9d..826d140 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.browser">
 
-    <original-package android:name="com.android.browser" />
-
     <permission android:name="com.android.browser.permission.PRELOAD"
         android:label="@string/permission_preload_label"
         android:protectionLevel="signatureOrSystem" />
@@ -57,17 +55,17 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application   android:name="Browser"
-                   android:label="@string/application_name"
-                   android:icon="@mipmap/ic_launcher_browser"
+                   android:label="@string/application_name_swe"
+                   android:icon="@mipmap/ic_launcher_browser_swe"
                    android:backupAgent=".BrowserBackupAgent"
                    android:hardwareAccelerated="true"
-                   android:taskAffinity="android.task.browser" >
+                   android:taskAffinity="android.task.swe.browser" >
 
         <uses-library android:name="com.qrd.useragent"
                       android:required="false" />
 
         <provider android:name=".provider.BrowserProvider2"
-                  android:authorities="com.android.browser;browser"
+                  android:authorities="com.android.swe.browser;swe.browser"
                   android:multiprocess="false"
                   android:exported="true"
                   android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
@@ -79,7 +77,7 @@
                     android:writePermission="com.android.browser.permission.WRITE_HOMEPAGE" />
         </provider>
         <activity android:name="BrowserActivity"
-                  android:label="@string/application_name"
+                  android:label="@string/application_name_swe"
                   android:launchMode="singleTask"
                   android:alwaysRetainTaskState="true"
                   android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
@@ -278,7 +276,7 @@
         <!-- For custom home pages (like most visited) -->
         <provider
             android:name=".homepages.HomeProvider"
-            android:authorities="com.android.browser.home"
+            android:authorities="com.android.swe.browser.home"
             android:grantUriPermissions="true"
             android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
             android:exported="false" />
@@ -304,11 +302,11 @@
          </receiver>
 
         <provider android:name=".provider.SnapshotProvider"
-                  android:authorities="com.android.browser.snapshots"
+                  android:authorities="com.android.swe.browser.snapshots"
                   android:exported="false" />
         <provider
             android:name=".provider.MyNavigationProvider"
-            android:authorities="com.android.browser.mynavigation"
+            android:authorities="com.android.swe.browser.mynavigation"
             android:exported="false" />
 
         <service android:name="org.chromium.content.app.SandboxedProcessService0"