From 3a7aacd3d5a42bf2f8271e66f4eecff5deae7535 Mon Sep 17 00:00:00 2001
From: mthiesse <mthiesse@chromium.org>
Date: Tue, 18 Apr 2017 14:50:17 -0700
Subject: [PATCH] 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}
---
 chrome/android/java/AndroidManifest.xml | 70 +++++++++----------------
 1 file changed, 24 insertions(+), 46 deletions(-)

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index d3f16e4c6a9f..96f076121602 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: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"
@@ -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: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"
@@ -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: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) %}
@@ -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:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
-            android:hardwareAccelerated="false"
+            {{ self.chrome_activity_common() }}
             {{ self.supports_video_persistence() }} >
         </activity>
         {% endfor %}
@@ -355,33 +345,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"
@@ -492,11 +478,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"
@@ -509,12 +493,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 }}"
@@ -528,11 +510,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"
-            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 }}"
@@ -540,12 +520,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 }}"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
-            {{ self.supports_video_persistence() }} >
+            {{ self.supports_video_persistence() }}
+            {{ self.chrome_activity_common() }}>
         </activity>
         {% endfor %}