Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1541)

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin
Patch Set: Comments Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/res/layout/upgrade_activity.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 4691aacedb5086238056397d868173a07c73a2bb..144e8e1fc49ef7ad6fff0ed3e6ed93718b649318 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -201,6 +201,21 @@ by a child template that "extends" this file.
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
+
+ <!-- Upgrade related -->
+ <activity android:name="org.chromium.chrome.browser.UpgradeActivity"
+ android:excludeFromRecents="true"
+ android:theme="@style/MainTheme"
+ android:windowSoftInputMode="adjustResize"
+ android:taskAffinity=""
+ android:launchMode="singleInstance"
+ android:persistableMode="persistNever"
+ android:autoRemoveFromRecents="false"
+ android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
+ android:hardwareAccelerated="false">
+ </activity>
+
+ <!-- Document mode Activities. -->
<activity android:name="org.chromium.chrome.browser.document.DocumentActivity"
android:exported="false"
android:theme="@style/MainTheme"
@@ -228,6 +243,8 @@ by a child template that "extends" this file.
<activity-alias android:name="com.google.android.apps.chrome.document.IncognitoDocumentActivity"
android:targetActivity="org.chromium.chrome.browser.document.IncognitoDocumentActivity"
android:exported="false"/>
+
+ <!-- Custom Tabs -->
<activity android:name="org.chromium.chrome.browser.customtabs.CustomTabActivity"
android:theme="@style/MainTheme"
android:exported="false"
@@ -235,6 +252,8 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
</activity>
+
+ <!-- ChromeTabbedActivity related -->
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
android:theme="@style/MainTheme"
android:exported="false"
@@ -252,6 +271,7 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
</activity>
+
<activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
android:theme="@style/MainTheme"
android:autoRemoveFromRecents="true">
« no previous file with comments | « no previous file | chrome/android/java/res/layout/upgrade_activity.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698