From ae1c17bd0f3ac8574b4f51ff171e7495f9685b24 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Mon, 13 Jun 2022 13:58:17 +0800
Subject: [PATCH] Add "smallestScreenSize" into homepage activities

The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.

After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.

Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.

Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
---
 AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0472f07936c..44be1ef6df9 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>