From 9e1b1cd5fa9a8cb17c61d17d16cec20bcc6e34ad Mon Sep 17 00:00:00 2001
From: samcackett <samcackett@google.com>
Date: Tue, 7 Jan 2025 17:27:40 +0000
Subject: [PATCH] Ensure split screen cancel label doesn't wrap

Fix: 379811238
Bug: 328577545
Bug: 345128488
Test: Visual inspection of instructions view in different languages/form
factors and display densities
Flag: EXEMPT bugfix

Change-Id: Iabdb76b7a02957e1918475b8a00f395f64e96301
---
 quickstep/res/layout/split_instructions_view.xml | 4 ++--
 quickstep/res/values-sw600dp/dimens.xml          | 5 -----
 quickstep/res/values/dimens.xml                  | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/quickstep/res/layout/split_instructions_view.xml b/quickstep/res/layout/split_instructions_view.xml
index a11974c858..b433a59245 100644
--- a/quickstep/res/layout/split_instructions_view.xml
+++ b/quickstep/res/layout/split_instructions_view.xml
@@ -29,9 +29,9 @@
         android:id="@+id/split_instructions_text"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:maxWidth="@dimen/split_instructions_view_max_width"
         android:textColor="?androidprv:attr/textColorOnAccent"
-        android:text="@string/toast_split_select_app" />
+        android:text="@string/toast_split_select_app"
+        android:layout_weight="1" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/split_instructions_text_cancel"
diff --git a/quickstep/res/values-sw600dp/dimens.xml b/quickstep/res/values-sw600dp/dimens.xml
index e24d8fea79..37a90a1672 100644
--- a/quickstep/res/values-sw600dp/dimens.xml
+++ b/quickstep/res/values-sw600dp/dimens.xml
@@ -44,9 +44,4 @@
     <dimen name="allset_page_margin_horizontal">120dp</dimen>
     <dimen name="allset_page_allset_text_size">38sp</dimen>
     <dimen name="allset_page_swipe_up_text_size">15sp</dimen>
-
-    <!-- Splitscreen -->
-    <!-- Max width of the split instructions view -->
-    <dimen name="split_instructions_view_max_width">300dp</dimen>
-
 </resources>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index b404bb519c..de0b2c7b90 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -522,9 +522,4 @@
 
     <!-- Digital Wellbeing -->
     <dimen name="digital_wellbeing_toast_height">48dp</dimen>
-
-    <!-- Splitscreen -->
-    <!-- Max width of the split instructions view -->
-    <dimen name="split_instructions_view_max_width">220dp</dimen>
-
 </resources>