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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2830743002: 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
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 46c4a51a86ea4ecc28b24cc664499a6f793f102d..0f3f80f204f39543ec96cb38b8930712ef19d25d 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -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"
@@ -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"
@@ -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) %}
@@ -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 %}
@@ -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"
@@ -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"
@@ -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 }}"
@@ -530,11 +512,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 }}"
@@ -542,12 +522,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 %}
« 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