commit 28552bd96d7dc972c71b8d86b205d8b7c23a7357
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Feb 21 10:20:02 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 21 10:20:02 2025 -0800
tree 1ccfbeaeb50983300296e53a879c65877ffd6f20
parent 9580cdac77be68f808864461fb178cbe554fe1ed
parent dd6cdc578b45ec43195b1516970d2caa7a5ef7d7

Merge "TerminalApp: Fix Settings layout in tablet" into main

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"