chrome/android/java/AndroidManifest.xml - Issue 2825133002: Ensure android:configChanges="uiMode" is handled for all ChromeActivitys

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 2825133002: Ensure android:configChanges="uiMode" is handled for all ChromeActivitys (Closed)

Patch Set: 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 side-by-side diff with in-line comments

Index: chrome/android/java/AndroidManifest.xml

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index ee95c16c3ab7350ae15c74ec3ea73f78a800ffc5..7eaf684640bfb93bf436211505262ae05fe578d5 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -291,12 +291,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: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"

@@ -305,12 +303,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: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"

@@ -320,20 +316,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: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:hardwareAccelerated="false"

+ {{ self.chrome_activity_common() }}

{{ self.supports_video_persistence() }} >

</activity>

{% for i in range(10) %}

@@ -342,11 +334,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:hardwareAccelerated="false"

+ {{ self.chrome_activity_common() }}

{{ self.supports_video_persistence() }} >

</activity>

{% endfor %}

@@ -355,33 +345,28 @@ 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: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:hardwareAccelerated="false" {% endblock %}

gone 2017/04/18 21:04:49 endblock on newline?

mthiesse 2017/04/18 21:09:35 If I put the endblock on a newline we get extra bl

gone 2017/04/18 21:13:54 We already do it on line 352, just above your new

mthiesse 2017/04/18 21:16:48 Done.

</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: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:hardwareAccelerated="false">

+ {{ self.chrome_activity_common() }}>

</activity>

<activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"

@@ -492,11 +477,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"

- {{ 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"

@@ -509,12 +492,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 }}"

- {{ 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 }}"

@@ -528,11 +509,9 @@ 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"

- {{ 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 }}"

@@ -540,12 +519,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.WebApkActivity{{ i }}"

- {{ self.supports_video_persistence() }} >

+ {{ self.supports_video_persistence() }}

+ {{ self.chrome_activity_common() }}>

</activity>

{% endfor %}

« no previous file with comments | « no previous file | no next file » | no next file with comments »