Skip to content

Commit 757a9a6

Browse files
author
Michael Thiessen
committed
Ensure android:configChanges="uiMode" is handled for all ChromeActivitys
BUG=711713 Review-Url: https://codereview.chromium.org/2825133002 Cr-Commit-Position: refs/heads/master@{#465388} (cherry picked from commit 3a7aacd) Review-Url: https://codereview.chromium.org/2830743002 . Cr-Commit-Position: refs/branch-heads/3071@{#55} Cr-Branched-From: a106f0a-refs/heads/master@{#464641}
1 parent 54365e6 commit 757a9a6

File tree

1 file changed

+24
-46
lines changed

1 file changed

+24
-46
lines changed

‎chrome/android/java/AndroidManifest.xml

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,10 @@ by a child template that "extends" this file.
293293
<activity android:name="org.chromium.chrome.browser.document.DocumentActivity"
294294
android:exported="false"
295295
android:theme="@style/MainTheme"
296-
android:windowSoftInputMode="adjustResize"
297296
android:taskAffinity=""
298297
android:persistableMode="persistAcrossReboots"
299298
android:autoRemoveFromRecents="false"
300-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
301-
android:hardwareAccelerated="false">
299+
{{ self.chrome_activity_common() }}>
302300
</activity>
303301
<activity-alias android:name="com.google.android.apps.chrome.document.DocumentActivity"
304302
android:targetActivity="org.chromium.chrome.browser.document.DocumentActivity"
@@ -307,12 +305,10 @@ by a child template that "extends" this file.
307305
android:icon="@mipmap/incognito_app_icon"
308306
android:exported="false"
309307
android:theme="@style/IncognitoTheme"
310-
android:windowSoftInputMode="adjustResize"
311308
android:taskAffinity=""
312309
android:persistableMode="persistNever"
313310
android:autoRemoveFromRecents="false"
314-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
315-
android:hardwareAccelerated="false">
311+
{{ self.chrome_activity_common() }}>
316312
</activity>
317313
<activity-alias android:name="com.google.android.apps.chrome.document.IncognitoDocumentActivity"
318314
android:targetActivity="org.chromium.chrome.browser.document.IncognitoDocumentActivity"
@@ -322,20 +318,16 @@ by a child template that "extends" this file.
322318
<activity android:name="org.chromium.chrome.browser.customtabs.CustomTabActivity"
323319
android:theme="@style/MainTheme"
324320
android:exported="false"
325-
android:windowSoftInputMode="adjustResize"
326-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
327-
android:hardwareAccelerated="false"
321+
{{ self.chrome_activity_common() }}
328322
{{ self.supports_video_persistence() }} >
329323
</activity>
330324
<activity android:name="org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity"
331325
android:theme="@style/MainTheme"
332326
android:exported="false"
333327
android:taskAffinity=""
334-
android:windowSoftInputMode="adjustResize"
335328
android:persistableMode="persistNever"
336329
android:autoRemoveFromRecents="false"
337-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
338-
android:hardwareAccelerated="false"
330+
{{ self.chrome_activity_common() }}
339331
{{ self.supports_video_persistence() }} >
340332
</activity>
341333
{% for i in range(10) %}
@@ -344,11 +336,9 @@ by a child template that "extends" this file.
344336
android:icon="@mipmap/app_single_page_icon"
345337
android:exported="false"
346338
android:launchMode="singleTask"
347-
android:windowSoftInputMode="adjustResize"
348339
android:persistableMode="persistNever"
349340
android:taskAffinity=""
350-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
351-
android:hardwareAccelerated="false"
341+
{{ self.chrome_activity_common() }}
352342
{{ self.supports_video_persistence() }} >
353343
</activity>
354344
{% endfor %}
@@ -357,33 +347,29 @@ by a child template that "extends" this file.
357347
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
358348
android:theme="@style/TabbedModeTheme"
359349
android:exported="false"
360-
android:windowSoftInputMode="adjustResize"
361350
android:launchMode="singleTask"
362-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
363-
android:hardwareAccelerated="false"
364351
{# We can only use blocks once in Jinja, for future substitutions we use
365352
self.supports_video_persistence(). #}
366353
{% block supports_video_persistence %}
367354
{% endblock %}
355+
{% block chrome_activity_common %}
356+
android:windowSoftInputMode="adjustResize"
357+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
358+
android:hardwareAccelerated="false"
359+
{% endblock %}
368360
>
369361
</activity>
370362
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
371-
android:theme="@style/TabbedModeTheme"
372-
android:exported="false"
373-
android:windowSoftInputMode="adjustResize"
374-
android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
375-
android:launchMode="singleTask"
376-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
377-
android:hardwareAccelerated="false"
378-
{{ self.supports_video_persistence() }}
379-
>
363+
android:theme="@style/TabbedModeTheme"
364+
android:exported="false"
365+
android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
366+
android:launchMode="singleTask"
367+
{{ self.chrome_activity_common() }}>
380368
</activity>
381369
<activity android:name="org.chromium.chrome.browser.multiwindow.MultiInstanceChromeTabbedActivity"
382370
android:theme="@style/TabbedModeTheme"
383371
android:exported="false"
384-
android:windowSoftInputMode="adjustResize"
385-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
386-
android:hardwareAccelerated="false">
372+
{{ self.chrome_activity_common() }}>
387373
</activity>
388374

389375
<activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
@@ -494,11 +480,9 @@ by a child template that "extends" this file.
494480
android:theme="@style/WebappTheme"
495481
android:label="@string/webapp_activity_title"
496482
android:documentLaunchMode="intoExisting"
497-
android:windowSoftInputMode="adjustResize"
498483
android:persistableMode="persistNever"
499-
android:hardwareAccelerated="false"
500-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
501-
{{ self.supports_video_persistence() }} >
484+
{{ self.supports_video_persistence() }}
485+
{{ self.chrome_activity_common() }}>
502486
</activity>
503487
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity"
504488
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity"
@@ -511,12 +495,10 @@ by a child template that "extends" this file.
511495
android:icon="@mipmap/app_shortcut_icon"
512496
android:label="@string/webapp_activity_title"
513497
android:launchMode="singleTask"
514-
android:windowSoftInputMode="adjustResize"
515498
android:persistableMode="persistNever"
516-
android:hardwareAccelerated="false"
517499
android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{{ i }}"
518-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
519-
{{ self.supports_video_persistence() }} >
500+
{{ self.supports_video_persistence() }}
501+
{{ self.chrome_activity_common() }}>
520502
</activity>
521503
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity{{ i }}"
522504
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity{{ i }}"
@@ -530,24 +512,20 @@ by a child template that "extends" this file.
530512
android:label="@string/webapp_activity_title"
531513
android:launchMode="singleTop"
532514
android:documentLaunchMode="intoExisting"
533-
android:windowSoftInputMode="adjustResize"
534515
android:persistableMode="persistNever"
535-
android:hardwareAccelerated="false"
536-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
537-
{{ self.supports_video_persistence() }} >
516+
{{ self.supports_video_persistence() }}
517+
{{ self.chrome_activity_common() }}>
538518
</activity>
539519
{% for i in range(10) %}
540520
<activity android:name="org.chromium.chrome.browser.webapps.WebApkActivity{{ i }}"
541521
android:theme="@style/WebappTheme"
542522
android:icon="@mipmap/app_shortcut_icon"
543523
android:label="@string/webapp_activity_title"
544524
android:launchMode="singleTask"
545-
android:windowSoftInputMode="adjustResize"
546525
android:persistableMode="persistNever"
547-
android:hardwareAccelerated="false"
548526
android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{{ i }}"
549-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
550-
{{ self.supports_video_persistence() }} >
527+
{{ self.supports_video_persistence() }}
528+
{{ self.chrome_activity_common() }}>
551529
</activity>
552530
{% endfor %}
553531

0 commit comments

Comments
 (0)