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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 2237293003: [FRE] Change the First Run Experience launching behavior (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Note: This is a jinja2 template, processed at build time into the final manifest . 7 Note: This is a jinja2 template, processed at build time into the final manifest .
8 8
9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden
10 by a child template that "extends" this file. 10 by a child template that "extends" this file.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 <!-- Note: All activities directly or indirectly derived from ChromeActi vity 133 <!-- Note: All activities directly or indirectly derived from ChromeActi vity
134 must specify android:hardwareAccelerated="false". 134 must specify android:hardwareAccelerated="false".
135 135
136 Since this activity (shown in the launcher) and the application 136 Since this activity (shown in the launcher) and the application
137 (shown in Android's Settings/Apps list) share the same label, we 137 (shown in Android's Settings/Apps list) share the same label, we
138 do not specify one here to allow it to inherit from the app. --> 138 do not specify one here to allow it to inherit from the app. -->
139 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity" 139 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity"
140 android:theme="@android:style/Theme.Translucent.NoTitleBar" 140 android:theme="@android:style/Theme.Translucent.NoTitleBar"
141 android:relinquishTaskIdentity="true" 141 android:relinquishTaskIdentity="true"
142 android:taskAffinity="" 142 android:taskAffinity=""
143 android:excludeFromRecents="true"> 143 android:excludeFromRecents="true"
144 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
144 </activity> 145 </activity>
145 <activity-alias android:name="com.google.android.apps.chrome.Main" 146 <activity-alias android:name="com.google.android.apps.chrome.Main"
146 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity" 147 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity"
147 android:exported="true"> 148 android:exported="true">
148 <intent-filter> 149 <intent-filter>
149 <action android:name="android.intent.action.MAIN" /> 150 <action android:name="android.intent.action.MAIN" />
150 <category android:name="android.intent.category.DEFAULT" /> 151 <category android:name="android.intent.category.DEFAULT" />
151 <category android:name="android.intent.category.LAUNCHER" /> 152 <category android:name="android.intent.category.LAUNCHER" />
152 <category android:name="android.intent.category.BROWSABLE" /> 153 <category android:name="android.intent.category.BROWSABLE" />
153 <category android:name="android.intent.category.APP_BROWSER" /> 154 <category android:name="android.intent.category.APP_BROWSER" />
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 android:hardwareAccelerated="false"> 361 android:hardwareAccelerated="false">
361 </activity> 362 </activity>
362 363
363 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 364 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
364 android:theme="@style/MainTheme" 365 android:theme="@style/MainTheme"
365 android:autoRemoveFromRecents="true"> 366 android:autoRemoveFromRecents="true">
366 </activity> 367 </activity>
367 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity" 368 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity"
368 android:theme="@style/LightweightFreDialog" 369 android:theme="@style/LightweightFreDialog"
369 android:launchMode="singleTop" 370 android:launchMode="singleTop"
371 android:autoRemoveFromRecents="true"
370 android:windowSoftInputMode="stateHidden|adjustPan" 372 android:windowSoftInputMode="stateHidden|adjustPan"
371 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 373 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
372 </activity> 374 </activity>
373 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 375 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
374 android:theme="@style/DialogWhenLarge" 376 android:theme="@style/DialogWhenLarge"
375 android:label="@string/fre_label" 377 android:label="@string/fre_label"
376 android:launchMode="singleTop" 378 android:launchMode="singleTop"
379 android:autoRemoveFromRecents="true"
377 android:windowSoftInputMode="stateHidden|adjustPan" 380 android:windowSoftInputMode="stateHidden|adjustPan"
378 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 381 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
379 </activity> 382 </activity>
380 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 383 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
381 android:theme="@style/MainTheme" 384 android:theme="@style/MainTheme"
382 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 385 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
383 </activity> 386 </activity>
384 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 387 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
385 android:theme="@style/PreferencesTheme" 388 android:theme="@style/PreferencesTheme"
386 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 389 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 909 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
907 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 910 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
908 The downstream manifest replaces this block, and hence replaces the list of media route 911 The downstream manifest replaces this block, and hence replaces the list of media route
909 controllers with its own list. --> 912 controllers with its own list. -->
910 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 913 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
911 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 914 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
912 915
913 {% endblock %} 916 {% endblock %}
914 </application> 917 </application>
915 </manifest> 918 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698