commit e058aae3cd06b299ad0156c8da47b7e878f7d18b
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 13 18:11:22 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 13 18:11:22 2022 +0000
tree 931b5bc6dd22e72cf49885eb5a96bd9b6dd3fcc0
parent e5a507e23c46602036bdb89c6000315aefa2a5a8
parent ae1c17bd0f3ac8574b4f51ff171e7495f9685b24

Merge "Add "smallestScreenSize" into homepage activities" into tm-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0472f07..44be1ef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -142,7 +142,7 @@
                   android:taskAffinity="com.android.settings.root"
                   android:launchMode="singleTask"
                   android:exported="true"
-                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">
+                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -158,7 +158,7 @@
                   android:launchMode="singleTask"
                   android:exported="true"
                   android:enabled="false"
-                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout"
+                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize"
                   android:permission="android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK">
             <intent-filter>
                 <action android:name="android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY" />
@@ -175,7 +175,7 @@
                   android:launchMode="singleTask"
                   android:exported="false"
                   android:excludeFromRecents="true"
-                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">
+                  android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity>