Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 android:value="true"/> | 101 android:value="true"/> |
| 102 | 102 |
| 103 {% if channel in ['dev', 'canary', 'default'] %} | 103 {% if channel in ['dev', 'canary', 'default'] %} |
| 104 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> | 104 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> |
| 105 {% endif %} | 105 {% endif %} |
| 106 {% if configuration_policy == '1' %} | 106 {% if configuration_policy == '1' %} |
| 107 <meta-data android:name="android.content.APP_RESTRICTIONS" | 107 <meta-data android:name="android.content.APP_RESTRICTIONS" |
| 108 android:resource="@xml/app_restrictions"/> | 108 android:resource="@xml/app_restrictions"/> |
| 109 {% endif %} | 109 {% endif %} |
| 110 | 110 |
| 111 <!-- Note: Set android:hardwareAccelerated to "false" in the ".Main" | 111 <!-- Note: Set android:hardwareAccelerated to "false" in the ".Main" |
|
newt (away)
2015/07/16 19:46:16
This comment in thoroughly out of date. Please rem
| |
| 112 activity below to go into software, browser tiling mode. | 112 activity below to go into software, browser tiling mode. |
| 113 | 113 |
| 114 Note: All activities directly or indirectly derived from ChromeActi vity | |
| 115 must specify android:hardwareAccelerated="false". | |
| 116 | |
| 114 Since this activity (shown in the launcher) and the application | 117 Since this activity (shown in the launcher) and the application |
| 115 (shown in Android's Settings/Apps list) share the same label, we | 118 (shown in Android's Settings/Apps list) share the same label, we |
| 116 do not specify one here to allow it to inherit from the app. --> | 119 do not specify one here to allow it to inherit from the app. --> |
| 117 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity" | 120 <activity android:name="org.chromium.chrome.browser.document.ChromeLaunc herActivity" |
| 118 android:theme="@android:style/Theme.Translucent.NoTitleBar"> | 121 android:theme="@android:style/Theme.Translucent.NoTitleBar"> |
| 119 </activity> | 122 </activity> |
| 120 <activity-alias android:name="com.google.android.apps.chrome.Main" | 123 <activity-alias android:name="com.google.android.apps.chrome.Main" |
| 121 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity" | 124 android:targetActivity="org.chromium.chrome.browser.document.ChromeL auncherActivity" |
| 122 android:exported="true"> | 125 android:exported="true"> |
| 123 <intent-filter> | 126 <intent-filter> |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 android:resource="@xml/searchable" /> | 192 android:resource="@xml/searchable" /> |
| 190 </activity-alias> | 193 </activity-alias> |
| 191 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity" | 194 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity" |
| 192 android:exported="false" | 195 android:exported="false" |
| 193 android:theme="@style/MainTheme" | 196 android:theme="@style/MainTheme" |
| 194 android:windowSoftInputMode="adjustResize" | 197 android:windowSoftInputMode="adjustResize" |
| 195 android:taskAffinity="" | 198 android:taskAffinity="" |
| 196 android:persistableMode="persistAcrossReboots" | 199 android:persistableMode="persistAcrossReboots" |
| 197 android:autoRemoveFromRecents="false" | 200 android:autoRemoveFromRecents="false" |
| 198 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" | 201 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" |
| 199 android:hardwareAccelerated="true"> | 202 android:hardwareAccelerated="false"> |
| 200 </activity> | 203 </activity> |
| 201 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity" | 204 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity" |
| 202 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity" | 205 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity" |
| 203 android:exported="false"/> | 206 android:exported="false"/> |
| 204 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity" | 207 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity" |
| 205 android:icon="@mipmap/incognito_app_icon" | 208 android:icon="@mipmap/incognito_app_icon" |
| 206 android:exported="false" | 209 android:exported="false" |
| 207 android:theme="@style/IncognitoTheme" | 210 android:theme="@style/IncognitoTheme" |
| 208 android:windowSoftInputMode="adjustResize" | 211 android:windowSoftInputMode="adjustResize" |
| 209 android:taskAffinity="" | 212 android:taskAffinity="" |
| 210 android:persistableMode="persistNever" | 213 android:persistableMode="persistNever" |
| 211 android:autoRemoveFromRecents="false" | 214 android:autoRemoveFromRecents="false" |
| 212 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" | 215 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" |
| 213 android:hardwareAccelerated="true"> | 216 android:hardwareAccelerated="false"> |
| 214 </activity> | 217 </activity> |
| 215 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" | 218 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" |
| 216 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" | 219 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" |
| 217 android:exported="false"/> | 220 android:exported="false"/> |
| 218 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" | 221 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" |
| 219 android:theme="@style/MainTheme" | 222 android:theme="@style/MainTheme" |
| 220 android:exported="false" | 223 android:exported="false" |
| 221 android:windowSoftInputMode="adjustResize" | 224 android:windowSoftInputMode="adjustResize" |
| 222 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" | 225 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" |
| 223 android:hardwareAccelerated="true"> | 226 android:hardwareAccelerated="false"> |
| 224 </activity> | 227 </activity> |
| 225 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " | 228 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " |
| 226 android:theme="@style/MainTheme" | 229 android:theme="@style/MainTheme" |
| 227 android:exported="false" | 230 android:exported="false" |
| 228 android:windowBackground="@drawable/window_background" | 231 android:windowBackground="@drawable/window_background" |
| 229 android:windowSoftInputMode="adjustResize" | 232 android:windowSoftInputMode="adjustResize" |
| 230 android:launchMode="singleTask" | 233 android:launchMode="singleTask" |
| 231 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc" | 234 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc" |
| 232 android:hardwareAccelerated="true"> | 235 android:hardwareAccelerated="false"> |
| 233 </activity> | 236 </activity> |
| 234 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" | 237 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" |
| 235 android:theme="@style/MainTheme" | 238 android:theme="@style/MainTheme" |
| 236 android:exported="false" | 239 android:exported="false" |
| 237 android:windowBackground="@drawable/window_background" | 240 android:windowBackground="@drawable/window_background" |
| 238 android:windowSoftInputMode="adjustResize" | 241 android:windowSoftInputMode="adjustResize" |
| 239 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" | 242 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" |
| 240 android:hardwareAccelerated="true"> | 243 android:hardwareAccelerated="false"> |
| 241 </activity> | 244 </activity> |
| 242 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" | 245 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" |
| 243 android:theme="@style/MainTheme" | 246 android:theme="@style/MainTheme" |
| 244 android:autoRemoveFromRecents="true"> | 247 android:autoRemoveFromRecents="true"> |
| 245 </activity> | 248 </activity> |
| 246 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity" | 249 <activity android:name="org.chromium.chrome.browser.bookmark.ManageBookm arkActivity" |
| 247 android:theme="@style/DialogWhenLargeHolo" | 250 android:theme="@style/DialogWhenLargeHolo" |
| 248 android:label="@string/save_bookmark" | 251 android:label="@string/save_bookmark" |
| 249 android:windowSoftInputMode="stateHidden|adjustPan" | 252 android:windowSoftInputMode="stateHidden|adjustPan" |
| 250 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> | 253 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 269 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> | 272 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> |
| 270 </activity> | 273 </activity> |
| 271 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" | 274 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" |
| 272 android:theme="@style/PreferencesTheme" | 275 android:theme="@style/PreferencesTheme" |
| 273 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" | 276 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" |
| 274 android:label="@string/preferences" | 277 android:label="@string/preferences" |
| 275 android:exported="false"> | 278 android:exported="false"> |
| 276 </activity> | 279 </activity> |
| 277 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" | 280 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" |
| 278 android:theme="@style/ThemeWithActionBar" | 281 android:theme="@style/ThemeWithActionBar" |
| 279 android:hardwareAccelerated="true" | 282 android:hardwareAccelerated="false" |
| 280 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> | 283 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> |
| 281 </activity> | 284 </activity> |
| 282 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" | 285 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" |
| 283 android:theme="@style/MainTheme" | 286 android:theme="@style/MainTheme" |
| 284 android:exported="true"> | 287 android:exported="true"> |
| 285 </activity> | 288 </activity> |
| 286 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity" | 289 <activity android:name="org.chromium.chrome.browser.enhancedbookmarks.En hancedBookmarkActivity" |
| 287 android:theme="@style/EnhancedBookmarkDialog" | 290 android:theme="@style/EnhancedBookmarkDialog" |
| 288 android:windowSoftInputMode="stateAlwaysHidden" | 291 android:windowSoftInputMode="stateAlwaysHidden" |
| 289 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > | 292 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" > |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> | 324 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> |
| 322 <category android:name="android.intent.category.DEFAULT" /> | 325 <category android:name="android.intent.category.DEFAULT" /> |
| 323 </intent-filter> | 326 </intent-filter> |
| 324 </activity-alias> | 327 </activity-alias> |
| 325 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" | 328 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" |
| 326 android:theme="@style/MainTheme" | 329 android:theme="@style/MainTheme" |
| 327 android:label="@string/webapp_activity_title" | 330 android:label="@string/webapp_activity_title" |
| 328 android:documentLaunchMode="intoExisting" | 331 android:documentLaunchMode="intoExisting" |
| 329 android:windowSoftInputMode="adjustResize" | 332 android:windowSoftInputMode="adjustResize" |
| 330 android:persistableMode="persistNever" | 333 android:persistableMode="persistNever" |
| 331 android:hardwareAccelerated="true" | 334 android:hardwareAccelerated="false" |
| 332 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> | 335 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> |
| 333 </activity> | 336 </activity> |
| 334 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" | 337 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" |
| 335 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" | 338 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" |
| 336 android:label="@string/webapp_activity_title"> | 339 android:label="@string/webapp_activity_title"> |
| 337 </activity-alias> | 340 </activity-alias> |
| 338 {% for i in range(10) %} | 341 {% for i in range(10) %} |
| 339 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" | 342 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" |
| 340 android:theme="@style/MainTheme" | 343 android:theme="@style/MainTheme" |
| 341 android:icon="@mipmap/app_shortcut_icon" | 344 android:icon="@mipmap/app_shortcut_icon" |
| 342 android:label="@string/webapp_activity_title" | 345 android:label="@string/webapp_activity_title" |
| 343 android:launchMode="singleTask" | 346 android:launchMode="singleTask" |
| 344 android:windowSoftInputMode="adjustResize" | 347 android:windowSoftInputMode="adjustResize" |
| 345 android:persistableMode="persistNever" | 348 android:persistableMode="persistNever" |
| 346 android:hardwareAccelerated="true" | 349 android:hardwareAccelerated="false" |
| 347 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" | 350 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" |
| 348 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> | 351 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> |
| 349 </activity> | 352 </activity> |
| 350 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" | 353 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" |
| 351 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" | 354 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" |
| 352 android:icon="@mipmap/app_shortcut_icon" | 355 android:icon="@mipmap/app_shortcut_icon" |
| 353 android:label="@string/webapp_activity_title"> | 356 android:label="@string/webapp_activity_title"> |
| 354 </activity-alias> | 357 </activity-alias> |
| 355 {% endfor %} | 358 {% endfor %} |
| 356 | 359 |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 620 choose the first MediaRouteController that can play it, so the orde r of the list can be important. | 623 choose the first MediaRouteController that can play it, so the orde r of the list can be important. |
| 621 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. | 624 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. |
| 622 The downstream manifest replaces this block, and hence replaces the list of media route | 625 The downstream manifest replaces this block, and hence replaces the list of media route |
| 623 controllers with its own list. --> | 626 controllers with its own list. --> |
| 624 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" | 627 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" |
| 625 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> | 628 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> |
| 626 | 629 |
| 627 {% endblock %} | 630 {% endblock %} |
| 628 </application> | 631 </application> |
| 629 </manifest> | 632 </manifest> |
| OLD | NEW |