Added modified files to consume SWE
Change-Id: I959781dad2a983de6be6ab07f418006a5708c976
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4441364..974052e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,13 +16,16 @@
*/
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.browser">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.swe.browser">
- <original-package android:name="com.android.browser" />
+ <original-package android:name="com.android.swe.browser" />
- <permission android:name="com.android.browser.permission.PRELOAD"
+ <permission android:name="com.android.swe.browser.permission.PRELOAD"
android:label="@string/permission_preload_label"
android:protectionLevel="signatureOrSystem" />
+ <permission android:name="com.android.swe.browser.permission.INITIALIZE_DATABASE"
+ android:protectionLevel="signatureOrSystem" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_DOWNLOAD_MANAGER"/>
@@ -47,21 +50,21 @@
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
- <uses-permission android:name="com.android.browser.permission.READ_HOMEPAGE" />
- <uses-permission android:name="com.android.browser.permission.WRITE_HOMEPAGE" />
+ <uses-permission android:name="com.android.swe.browser.permission.READ_HOMEPAGE" />
+ <uses-permission android:name="com.android.swe.browser.permission.WRITE_HOMEPAGE" />
+ <uses-permission android:name="com.android.swe.browser.permission.INITIALIZE_DATABASE"/>
- <application android:name="Browser"
+ <application android:name="com.android.swe.browser.Browser"
android:label="@string/application_name"
android:icon="@mipmap/ic_launcher_browser"
android:backupAgent=".BrowserBackupAgent"
android:hardwareAccelerated="true"
android:taskAffinity="android.task.browser" >
-
<uses-library android:name="com.qrd.useragent"
android:required="false" />
- <provider android:name=".provider.BrowserProvider2"
- android:authorities="com.android.browser;browser"
+ <provider android:name="com.android.swe.browser.provider.BrowserProvider2"
+ android:authorities="com.android.swe.browser"
android:multiprocess="false"
android:exported="true"
android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
@@ -69,10 +72,10 @@
<path-permission android:path="/bookmarks/search_suggest_query"
android:readPermission="android.permission.GLOBAL_SEARCH" />
<path-permission android:path="/homepage"
- android:readPermission="com.android.browser.permission.READ_HOMEPAGE"
- android:writePermission="com.android.browser.permission.WRITE_HOMEPAGE" />
+ android:readPermission="com.android.swe.browser.permission.READ_HOMEPAGE"
+ android:writePermission="com.android.swe.browser.permission.WRITE_HOMEPAGE" />
</provider>
- <activity android:name="BrowserActivity"
+ <activity android:name="com.android.swe.browser.BrowserActivity"
android:label="@string/application_name"
android:launchMode="singleTask"
android:alwaysRetainTaskState="true"
@@ -161,7 +164,7 @@
android:resource="@xml/searchable" />
</activity>
- <activity android:name="ShortcutActivity"
+ <activity android:name="com.android.swe.browser.ShortcutActivity"
android:theme="@style/ShortcutTheme"
android:label="@string/shortcut_bookmark"
android:icon="@mipmap/ic_launcher_shortcut_browser_bookmark">
@@ -173,14 +176,15 @@
</activity>
- <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences">
+ <activity android:name="com.android.swe.browser.BrowserPreferencesPage"
+ android:label="@string/menu_preferences">
<intent-filter>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="BookmarkSearch"
+ <activity android:name="com.android.swe.browser.BookmarkSearch"
android:label="@string/bookmarks_search"
android:stateNotNeeded="true"
android:theme="@android:style/Theme.NoDisplay"
@@ -193,7 +197,8 @@
android:resource="@xml/bookmarks_searchable" />
</activity>
- <activity android:name="AddBookmarkPage" android:label="@string/bookmarks_add_page"
+ <activity android:name="com.android.swe.browser.AddBookmarkPage"
+ android:label="@string/bookmarks_add_page"
android:theme="@style/DialogWhenLarge"
android:configChanges="orientation|keyboardHidden|screenSize"
android:windowSoftInputMode="adjustResize">
@@ -204,7 +209,8 @@
</intent-filter>
</activity>
- <activity android:name="DownloadSettings" android:label="@string/download_settings_title"
+ <activity android:name="com.android.swe.browser.DownloadSettings"
+ android:label="@string/download_settings_title"
android:theme="@style/DialogWhenLarge"
android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -214,12 +220,12 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
-
<activity android:name="ComboViewActivity">
</activity>
<!-- used to new folder in bookmark page for carrier -->
- <activity android:name="AddBookmarkFolder" android:label="@string/save_bookmark_folder"
+ <activity android:name="com.android.swe.browser.AddBookmarkFolder"
+ android:label="@string/save_bookmark_folder"
android:theme="@style/DialogWhenLarge"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
@@ -230,26 +236,26 @@
<!-- Bookmark thumbnail homescreen widget -->
<receiver
- android:name=".widget.BookmarkThumbnailWidgetProvider"
+ android:name="com.android.swe.browser.widget.BookmarkThumbnailWidgetProvider"
android:label="@string/bookmarks">
<intent-filter>
<action
android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action
- android:name="com.android.browser.BOOKMARK_APPWIDGET_UPDATE" />
+ android:name="com.android.swe.browser.BOOKMARK_APPWIDGET_UPDATE" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/bookmarkthumbnailwidget_info" />
</receiver>
<service
- android:name=".widget.BookmarkThumbnailWidgetService"
+ android:name="com.android.swe.browser.widget.BookmarkThumbnailWidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS"
android:exported="false" />
<receiver
- android:name=".widget.BookmarkWidgetProxy"
+ android:name="com.android.swe.browser.widget.BookmarkWidgetProxy"
android:exported="false" />
- <activity android:name=".widget.BookmarkWidgetConfigure"
+ <activity android:name="com.android.swe.browser.widget.BookmarkWidgetConfigure"
android:theme="@android:style/Theme.Holo.DialogWhenLarge">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
@@ -257,12 +263,11 @@
</activity>
<!-- add or edit my navigation activity -->
- <activity android:name=".mynavigation.AddMyNavigationPage"
+ <activity android:name="com.android.swe.browser.mynavigation.AddMyNavigationPage"
android:label="@string/my_navigation_page_title"
android:configChanges="orientation|keyboardHidden"
android:windowSoftInputMode="stateHidden">
</activity>
-
<!-- Makes .BrowserActivity the search target for any activity in Browser -->
<meta-data android:name="android.app.default_searchable" android:value=".BrowserActivity" />
@@ -274,7 +279,7 @@
<meta-data android:name="com.google.android.partnersetup.RLZ_ACCESS_POINT"
android:value="@string/rlz_access_point" />
- <receiver android:name=".OpenDownloadReceiver">
+ <receiver android:name="com.android.swe.browser.OpenDownloadReceiver">
<intent-filter>
<action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED"/>
</intent-filter>
@@ -282,41 +287,119 @@
<!-- For custom home pages (like most visited) -->
<provider
- android:name=".homepages.HomeProvider"
- android:authorities="com.android.browser.home"
+ android:name="com.android.swe.browser.homepages.HomeProvider"
+ android:authorities="com.android.swe.browser.home"
android:grantUriPermissions="true"
android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
android:exported="false" />
- <receiver android:name=".AccountsChangedReceiver">
+ <receiver android:name="com.android.swe.browser.AccountsChangedReceiver">
<intent-filter>
<action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
</intent-filter>
</receiver>
- <receiver android:name=".MessagesReceiver">
+ <receiver android:name="com.android.swe.browser.MessagesReceiver">
<intent-filter>
<action android:name="com.android.mms.transaction.MESSAGE_RECEIVED" />
</intent-filter>
</receiver>
-
- <receiver android:name=".PreloadRequestReceiver"
- android:permission="com.android.browser.permission.PRELOAD" >
+ <receiver android:name="com.android.swe.browser.PreloadRequestReceiver"
+ android:permission="com.android.swe.browser.permission.PRELOAD" >
<intent-filter>
<action android:name="android.intent.action.PRELOAD"/>
<data android:scheme="http" />
</intent-filter>
</receiver>
- <provider android:name=".provider.SnapshotProvider"
- android:authorities="com.android.browser.snapshots"
+ <provider android:name="com.android.swe.browser.provider.SnapshotProvider"
+ android:authorities="com.android.swe.browser.snapshots"
android:exported="false" />
<provider
- android:name=".provider.MyNavigationProvider"
- android:authorities="com.android.browser.mynavigation"
+ android:name="com.android.swe.browser.provider.MyNavigationProvider"
+ android:authorities="com.android.swe.browser.mynavigation"
android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService0"
+ android:process=":sandboxed_process0"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService1"
+ android:process=":sandboxed_process1"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService2"
+ android:process=":sandboxed_process2"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService3"
+ android:process=":sandboxed_process3"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService4"
+ android:process=":sandboxed_process4"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService5"
+ android:process=":sandboxed_process5"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService6"
+ android:process=":sandboxed_process6"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService7"
+ android:process=":sandboxed_process7"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService8"
+ android:process=":sandboxed_process8"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService9"
+ android:process=":sandboxed_process9"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService10"
+ android:process=":sandboxed_process10"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService11"
+ android:process=":sandboxed_process11"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService12"
+ android:process=":sandboxed_process12"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
+ <service android:name="org.chromium.content.app.SandboxedProcessService13"
+ android:process=":sandboxed_process13"
+ android:permission="org.chromium.content_shell.permission.SANDBOX"
+ android:isolatedProcess="true"
+ android:exported="false" />
</application>
-</manifest>
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
+ <permission android:name="org.chromium.content_shell.permission.SANDBOX"
+ android:protectionLevel="signatureOrSystem" />
+
+ <uses-permission android:name="android.permission.VIBRATE"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-feature android:name="android.hardware.location.gps" android:required="false" />
+
+</manifest>
\ No newline at end of file