From 85c9c3e6ad407416cb51d84e77a462b09d04cc6f Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Mon, 28 Jun 2021 15:09:28 +0800
Subject: [PATCH] Fix the problem that the title of MainsSitchPreference will
 be truncated.

- Remove the maxLines=2 attribute.

Fix: 189921147
Test: robotest and see the UI
Change-Id: Ia62fd2f5ed1e76c9f1149e842bdae308e83fb03b
---
 .../res/layout-v31/settingslib_main_switch_bar.xml            | 4 ++--
 .../SettingsLib/MainSwitchPreference/res/values/dimens.xml    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
index 2518a6d06255d..6e5911cbf0a0f 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
@@ -36,9 +36,9 @@
             android:layout_height="wrap_content"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="@dimen/settingslib_switch_title_margin"
+            android:layout_marginVertical="@dimen/settingslib_switch_title_margin"
             android:layout_gravity="center_vertical"
-            android:maxLines="2"
             android:ellipsize="end"
             android:textAppearance="?android:attr/textAppearanceListItem"
             style="@style/MainSwitchText.Settingslib" />
diff --git a/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml b/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml
index a386adbafe2a3..16b8af6a2dab1 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml
@@ -41,6 +41,9 @@
     <!-- Radius of switch bar -->
     <dimen name="settingslib_switch_bar_radius">28dp</dimen>
 
+    <!-- Size of title margin -->
+    <dimen name="settingslib_switch_title_margin">16dp</dimen>
+
     <!-- SwitchBar sub settings margin start / end -->
     <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>
     <dimen name="settingslib_switchbar_subsettings_margin_end">16dp</dimen>