commit d8cf1ac14ea18c3f7fe6bab778fbba4629939757
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Feb 21 10:22:36 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 10:22:36 2025 -0800
tree cb7d43c43aae932c1eec1b9d6e0c540f15f611aa
parent 0abbaa35c3448e4b5834bb0ebf286d9e110923dc
parent 28552bd96d7dc972c71b8d86b205d8b7c23a7357

Merge "TerminalApp: Fix Settings layout in tablet" into main am: 28552bd96d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3503318

Change-Id: I4c78db29ef4a3676d70e8dbbea6474b7294cc573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/TerminalApp/res/xml/main_split_config.xml

diff --git a/android/TerminalApp/res/xml/main_split_config.xml b/android/TerminalApp/res/xml/main_split_config.xml
index 437e75a..bd0271b 100644
--- a/android/TerminalApp/res/xml/main_split_config.xml
+++ b/android/TerminalApp/res/xml/main_split_config.xml
@@ -17,10 +17,6 @@
 <resources xmlns:window="http://schemas.android.com/apk/res-auto">
 
     <!-- Define a split for the named activities. -->
-    <ActivityRule window:alwaysExpand="true">
-        <ActivityFilter window:activityName=".MainActivity" />
-    </ActivityRule>
-
     <SplitPairRule
         window:clearTop="true"
         window:finishPrimaryWithSecondary="adjacent"
@@ -42,6 +38,7 @@
 
     <SplitPlaceholderRule
         window:placeholderActivityName="com.android.virtualization.terminal.SettingsDiskResizeActivity"
+        window:finishPrimaryWithPlaceholder="adjacent"
         window:splitLayoutDirection="locale"
         window:splitMaxAspectRatioInPortrait="alwaysAllow"
         window:splitMinWidthDp="@integer/split_min_width"