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

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

Issue 2825133002: Ensure android:configChanges="uiMode" is handled for all ChromeActivitys (Closed)
Patch Set: add newline Created 3 years, 8 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 | no next file » | 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 android:exported="false"> 284 android:exported="false">
285 <intent-filter> 285 <intent-filter>
286 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" /> 286 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
287 </intent-filter> 287 </intent-filter>
288 </receiver> 288 </receiver>
289 289
290 <!-- Document mode Activities. --> 290 <!-- Document mode Activities. -->
291 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity" 291 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity"
292 android:exported="false" 292 android:exported="false"
293 android:theme="@style/MainTheme" 293 android:theme="@style/MainTheme"
294 android:windowSoftInputMode="adjustResize"
295 android:taskAffinity="" 294 android:taskAffinity=""
296 android:persistableMode="persistAcrossReboots" 295 android:persistableMode="persistAcrossReboots"
297 android:autoRemoveFromRecents="false" 296 android:autoRemoveFromRecents="false"
298 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 297 {{ self.chrome_activity_common() }}>
299 android:hardwareAccelerated="false">
300 </activity> 298 </activity>
301 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity" 299 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity"
302 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity" 300 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity"
303 android:exported="false"/> 301 android:exported="false"/>
304 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity" 302 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity"
305 android:icon="@mipmap/incognito_app_icon" 303 android:icon="@mipmap/incognito_app_icon"
306 android:exported="false" 304 android:exported="false"
307 android:theme="@style/IncognitoTheme" 305 android:theme="@style/IncognitoTheme"
308 android:windowSoftInputMode="adjustResize"
309 android:taskAffinity="" 306 android:taskAffinity=""
310 android:persistableMode="persistNever" 307 android:persistableMode="persistNever"
311 android:autoRemoveFromRecents="false" 308 android:autoRemoveFromRecents="false"
312 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 309 {{ self.chrome_activity_common() }}>
313 android:hardwareAccelerated="false">
314 </activity> 310 </activity>
315 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" 311 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity"
316 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" 312 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity"
317 android:exported="false"/> 313 android:exported="false"/>
318 314
319 <!-- Custom Tabs --> 315 <!-- Custom Tabs -->
320 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" 316 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity"
321 android:theme="@style/MainTheme" 317 android:theme="@style/MainTheme"
322 android:exported="false" 318 android:exported="false"
323 android:windowSoftInputMode="adjustResize" 319 {{ self.chrome_activity_common() }}
324 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
325 android:hardwareAccelerated="false"
326 {{ self.supports_video_persistence() }} > 320 {{ self.supports_video_persistence() }} >
327 </activity> 321 </activity>
328 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity" 322 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity"
329 android:theme="@style/MainTheme" 323 android:theme="@style/MainTheme"
330 android:exported="false" 324 android:exported="false"
331 android:taskAffinity="" 325 android:taskAffinity=""
332 android:windowSoftInputMode="adjustResize"
333 android:persistableMode="persistNever" 326 android:persistableMode="persistNever"
334 android:autoRemoveFromRecents="false" 327 android:autoRemoveFromRecents="false"
335 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 328 {{ self.chrome_activity_common() }}
336 android:hardwareAccelerated="false"
337 {{ self.supports_video_persistence() }} > 329 {{ self.supports_video_persistence() }} >
338 </activity> 330 </activity>
339 {% for i in range(10) %} 331 {% for i in range(10) %}
340 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}" 332 <activity android:name="org.chromium.chrome.browser.customtabs.SeparateT askCustomTabActivity{{ i }}"
341 android:theme="@style/MainTheme" 333 android:theme="@style/MainTheme"
342 android:icon="@mipmap/app_single_page_icon" 334 android:icon="@mipmap/app_single_page_icon"
343 android:exported="false" 335 android:exported="false"
344 android:launchMode="singleTask" 336 android:launchMode="singleTask"
345 android:windowSoftInputMode="adjustResize"
346 android:persistableMode="persistNever" 337 android:persistableMode="persistNever"
347 android:taskAffinity="" 338 android:taskAffinity=""
348 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 339 {{ self.chrome_activity_common() }}
349 android:hardwareAccelerated="false"
350 {{ self.supports_video_persistence() }} > 340 {{ self.supports_video_persistence() }} >
351 </activity> 341 </activity>
352 {% endfor %} 342 {% endfor %}
353 343
354 <!-- ChromeTabbedActivity related --> 344 <!-- ChromeTabbedActivity related -->
355 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " 345 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity "
356 android:theme="@style/TabbedModeTheme" 346 android:theme="@style/TabbedModeTheme"
357 android:exported="false" 347 android:exported="false"
358 android:windowSoftInputMode="adjustResize"
359 android:launchMode="singleTask" 348 android:launchMode="singleTask"
360 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
361 android:hardwareAccelerated="false"
362 {# We can only use blocks once in Jinja, for future substitutions we use 349 {# We can only use blocks once in Jinja, for future substitutions we use
363 self.supports_video_persistence(). #} 350 self.supports_video_persistence(). #}
364 {% block supports_video_persistence %} 351 {% block supports_video_persistence %}
365 {% endblock %} 352 {% endblock %}
353 {% block chrome_activity_common %}
354 android:windowSoftInputMode="adjustResize"
355 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
356 android:hardwareAccelerated="false"
357 {% endblock %}
366 > 358 >
367 </activity> 359 </activity>
368 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2" 360 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity 2"
369 android:theme="@style/TabbedModeTheme" 361 android:theme="@style/TabbedModeTheme"
370 android:exported="false" 362 android:exported="false"
371 android:windowSoftInputMode="adjustResize" 363 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
372 android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2" 364 android:launchMode="singleTask"
373 android:launchMode="singleTask" 365 {{ self.chrome_activity_common() }}>
374 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
375 android:hardwareAccelerated="false"
376 {{ self.supports_video_persistence() }}
PEConn 2017/04/27 08:48:54 I'm guessing you removed this line by accident? I'
377 >
378 </activity> 366 </activity>
379 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 367 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
380 android:theme="@style/TabbedModeTheme" 368 android:theme="@style/TabbedModeTheme"
381 android:exported="false" 369 android:exported="false"
382 android:windowSoftInputMode="adjustResize" 370 {{ self.chrome_activity_common() }}>
383 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
384 android:hardwareAccelerated="false">
385 </activity> 371 </activity>
386 372
387 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 373 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
388 android:theme="@style/MainTheme" 374 android:theme="@style/MainTheme"
389 android:autoRemoveFromRecents="true"> 375 android:autoRemoveFromRecents="true">
390 </activity> 376 </activity>
391 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity" 377 <activity android:name="org.chromium.chrome.browser.firstrun.Lightweight FirstRunActivity"
392 android:theme="@style/SimpleDialog" 378 android:theme="@style/SimpleDialog"
393 android:launchMode="singleTop" 379 android:launchMode="singleTop"
394 android:autoRemoveFromRecents="true" 380 android:autoRemoveFromRecents="true"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 <category android:name="android.intent.category.DEFAULT" /> 471 <category android:name="android.intent.category.DEFAULT" />
486 </intent-filter> 472 </intent-filter>
487 </activity> 473 </activity>
488 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager" 474 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager"
489 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity"> 475 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity">
490 </activity-alias> 476 </activity-alias>
491 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" 477 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty"
492 android:theme="@style/WebappTheme" 478 android:theme="@style/WebappTheme"
493 android:label="@string/webapp_activity_title" 479 android:label="@string/webapp_activity_title"
494 android:documentLaunchMode="intoExisting" 480 android:documentLaunchMode="intoExisting"
495 android:windowSoftInputMode="adjustResize"
496 android:persistableMode="persistNever" 481 android:persistableMode="persistNever"
497 android:hardwareAccelerated="false" 482 {{ self.supports_video_persistence() }}
498 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 483 {{ self.chrome_activity_common() }}>
499 {{ self.supports_video_persistence() }} >
500 </activity> 484 </activity>
501 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" 485 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity"
502 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" 486 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity"
503 android:label="@string/webapp_activity_title" 487 android:label="@string/webapp_activity_title"
504 {{ self.supports_video_persistence() }} > 488 {{ self.supports_video_persistence() }} >
505 </activity-alias> 489 </activity-alias>
506 {% for i in range(10) %} 490 {% for i in range(10) %}
507 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" 491 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}"
508 android:theme="@style/WebappTheme" 492 android:theme="@style/WebappTheme"
509 android:icon="@mipmap/app_shortcut_icon" 493 android:icon="@mipmap/app_shortcut_icon"
510 android:label="@string/webapp_activity_title" 494 android:label="@string/webapp_activity_title"
511 android:launchMode="singleTask" 495 android:launchMode="singleTask"
512 android:windowSoftInputMode="adjustResize"
513 android:persistableMode="persistNever" 496 android:persistableMode="persistNever"
514 android:hardwareAccelerated="false"
515 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" 497 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}"
516 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 498 {{ self.supports_video_persistence() }}
517 {{ self.supports_video_persistence() }} > 499 {{ self.chrome_activity_common() }}>
518 </activity> 500 </activity>
519 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" 501 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}"
520 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" 502 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}"
521 android:icon="@mipmap/app_shortcut_icon" 503 android:icon="@mipmap/app_shortcut_icon"
522 android:label="@string/webapp_activity_title"> 504 android:label="@string/webapp_activity_title">
523 </activity-alias> 505 </activity-alias>
524 {% endfor %} 506 {% endfor %}
525 <!-- Activities for WebAPKs. --> 507 <!-- Activities for WebAPKs. -->
526 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" 508 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty"
527 android:theme="@style/WebappTheme" 509 android:theme="@style/WebappTheme"
528 android:label="@string/webapp_activity_title" 510 android:label="@string/webapp_activity_title"
529 android:launchMode="singleTop" 511 android:launchMode="singleTop"
530 android:documentLaunchMode="intoExisting" 512 android:documentLaunchMode="intoExisting"
531 android:windowSoftInputMode="adjustResize"
532 android:persistableMode="persistNever" 513 android:persistableMode="persistNever"
533 android:hardwareAccelerated="false" 514 {{ self.supports_video_persistence() }}
534 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 515 {{ self.chrome_activity_common() }}>
535 {{ self.supports_video_persistence() }} >
536 </activity> 516 </activity>
537 {% for i in range(10) %} 517 {% for i in range(10) %}
538 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" 518 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}"
539 android:theme="@style/WebappTheme" 519 android:theme="@style/WebappTheme"
540 android:icon="@mipmap/app_shortcut_icon" 520 android:icon="@mipmap/app_shortcut_icon"
541 android:label="@string/webapp_activity_title" 521 android:label="@string/webapp_activity_title"
542 android:launchMode="singleTask" 522 android:launchMode="singleTask"
543 android:windowSoftInputMode="adjustResize"
544 android:persistableMode="persistNever" 523 android:persistableMode="persistNever"
545 android:hardwareAccelerated="false"
546 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}" 524 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}"
547 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 525 {{ self.supports_video_persistence() }}
548 {{ self.supports_video_persistence() }} > 526 {{ self.chrome_activity_common() }}>
549 </activity> 527 </activity>
550 {% endfor %} 528 {% endfor %}
551 529
552 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 530 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
553 android:theme="@style/MainTheme" 531 android:theme="@style/MainTheme"
554 android:label="Chrome.ExpandedControllerActivity" 532 android:label="Chrome.ExpandedControllerActivity"
555 android:hardwareAccelerated="true" 533 android:hardwareAccelerated="true"
556 android:launchMode="singleTask" 534 android:launchMode="singleTask"
557 android:noHistory="true" 535 android:noHistory="true"
558 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 536 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 949 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
972 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 950 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
973 The downstream manifest replaces this block, and hence replaces the list of media route 951 The downstream manifest replaces this block, and hence replaces the list of media route
974 controllers with its own list. --> 952 controllers with its own list. -->
975 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 953 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
976 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 954 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
977 955
978 {% endblock %} 956 {% endblock %}
979 </application> 957 </application>
980 </manifest> 958 </manifest>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698