Skip to content

Commit

Permalink
Ensure android:configChanges="uiMode" is handled for all ChromeActivitys
Browse files Browse the repository at this point in the history 
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}
  • Loading branch information
Michael Thiessen committed Apr 19, 2017
1 parent 54365e6 commit 757a9a6
Showing 1 changed file with 24 additions and 46 deletions.
70 changes: 24 additions & 46 deletions chrome/android/java/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,10 @@ by a child template that "extends" this file.
<activity android:name="org.chromium.chrome.browser.document.DocumentActivity"
android:exported="false"
android:theme="@style/MainTheme"
android:windowSoftInputMode="adjustResize"
android:taskAffinity=""
android:persistableMode="persistAcrossReboots"
android:autoRemoveFromRecents="false"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
{{ self.chrome_activity_common() }}>
</activity>
<activity-alias android:name="com.google.android.apps.chrome.document.DocumentActivity"
android:targetActivity="org.chromium.chrome.browser.document.DocumentActivity"
Expand All @@ -307,12 +305,10 @@ by a child template that "extends" this file.
android:icon="@mipmap/incognito_app_icon"
android:exported="false"
android:theme="@style/IncognitoTheme"
android:windowSoftInputMode="adjustResize"
android:taskAffinity=""
android:persistableMode="persistNever"
android:autoRemoveFromRecents="false"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false">
{{ self.chrome_activity_common() }}>
</activity>
<activity-alias android:name="com.google.android.apps.chrome.document.IncognitoDocumentActivity"
android:targetActivity="org.chromium.chrome.browser.document.IncognitoDocumentActivity"
Expand All @@ -322,20 +318,16 @@ by a child template that "extends" this file.
<activity android:name="org.chromium.chrome.browser.customtabs.CustomTabActivity"
android:theme="@style/MainTheme"
android:exported="false"
android:windowSoftInputMode="adjustResize"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false"
{{ self.chrome_activity_common() }}
{{ self.supports_video_persistence() }} >
</activity>
<activity android:name="org.chromium.chrome.browser.customtabs.SeparateTaskCustomTabActivity"
android:theme="@style/MainTheme"
android:exported="false"
android:taskAffinity=""
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:autoRemoveFromRecents="false"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false"
{{ self.chrome_activity_common() }}
{{ self.supports_video_persistence() }} >
</activity>
{% for i in range(10) %}
Expand All @@ -344,11 +336,9 @@ by a child template that "extends" this file.
android:icon="@mipmap/app_single_page_icon"
android:exported="false"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:taskAffinity=""
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false"
{{ self.chrome_activity_common() }}
{{ self.supports_video_persistence() }} >
</activity>
{% endfor %}
Expand All @@ -357,33 +347,29 @@ by a child template that "extends" this file.
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity"
android:theme="@style/TabbedModeTheme"
android:exported="false"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
android:hardwareAccelerated="false"
{# We can only use blocks once in Jinja, for future substitutions we use
self.supports_video_persistence(). #}
{% block supports_video_persistence %}
{% endblock %}
{% block chrome_activity_common %}
android:windowSoftInputMode="adjustResize"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
android:hardwareAccelerated="false"
{% endblock %}
>
</activity>
<activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity2"
android:theme="@style/TabbedModeTheme"
android:exported="false"
android:windowSoftInputMode="adjustResize"
android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
android:launchMode="singleTask"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
android:hardwareAccelerated="false"
{{ self.supports_video_persistence() }}
>
android:theme="@style/TabbedModeTheme"
android:exported="false"
android:taskAffinity="{{ manifest_package }}.ChromeTabbedActivity2"
android:launchMode="singleTask"
{{ self.chrome_activity_common() }}>
</activity>
<activity android:name="org.chromium.chrome.browser.multiwindow.MultiInstanceChromeTabbedActivity"
android:theme="@style/TabbedModeTheme"
android:exported="false"
android:windowSoftInputMode="adjustResize"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize|uiMode"
android:hardwareAccelerated="false">
{{ self.chrome_activity_common() }}>
</activity>

<activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
Expand Down Expand Up @@ -494,11 +480,9 @@ by a child template that "extends" this file.
android:theme="@style/WebappTheme"
android:label="@string/webapp_activity_title"
android:documentLaunchMode="intoExisting"
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:hardwareAccelerated="false"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
{{ self.supports_video_persistence() }} >
{{ self.supports_video_persistence() }}
{{ self.chrome_activity_common() }}>
</activity>
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity"
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity"
Expand All @@ -511,12 +495,10 @@ by a child template that "extends" this file.
android:icon="@mipmap/app_shortcut_icon"
android:label="@string/webapp_activity_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:hardwareAccelerated="false"
android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{{ i }}"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
{{ self.supports_video_persistence() }} >
{{ self.supports_video_persistence() }}
{{ self.chrome_activity_common() }}>
</activity>
<activity-alias android:name="com.google.android.apps.chrome.webapps.WebappActivity{{ i }}"
android:targetActivity="org.chromium.chrome.browser.webapps.WebappActivity{{ i }}"
Expand All @@ -530,24 +512,20 @@ by a child template that "extends" this file.
android:label="@string/webapp_activity_title"
android:launchMode="singleTop"
android:documentLaunchMode="intoExisting"
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:hardwareAccelerated="false"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
{{ self.supports_video_persistence() }} >
{{ self.supports_video_persistence() }}
{{ self.chrome_activity_common() }}>
</activity>
{% for i in range(10) %}
<activity android:name="org.chromium.chrome.browser.webapps.WebApkActivity{{ i }}"
android:theme="@style/WebappTheme"
android:icon="@mipmap/app_shortcut_icon"
android:label="@string/webapp_activity_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:persistableMode="persistNever"
android:hardwareAccelerated="false"
android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{{ i }}"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
{{ self.supports_video_persistence() }} >
{{ self.supports_video_persistence() }}
{{ self.chrome_activity_common() }}>
</activity>
{% endfor %}

Expand Down

0 comments on commit 757a9a6

Please sign in to comment.