From ccc8a93c6c8132a8b7459ff868099f3ee2cffb97 Mon Sep 17 00:00:00 2001
From: menghanli <menghanli@google.com>
Date: Thu, 27 May 2021 08:48:22 +0800
Subject: [PATCH] Fix Magnification shortcut option content overlap with top
 and bottom dialog container

Problem: After SuW theme applied, the scrollview viewport seems can draw outside of bounds.
Solution: Define whether a child is limited to draw inside of its bounds or not.

Test: Run initBCTestEnv_S.sh and apply different color
Bug: 187007290
Change-Id: Ie3a27616d7f30804c30e5101d2488216df516578
---
 res/layout/accessibility_edit_shortcut.xml    |  36 +++---
 ...essibility_edit_shortcut_magnification.xml | 105 +++++++++---------
 2 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/res/layout/accessibility_edit_shortcut.xml b/res/layout/accessibility_edit_shortcut.xml
index 53a05f77726..d0c925ea4ec 100644
--- a/res/layout/accessibility_edit_shortcut.xml
+++ b/res/layout/accessibility_edit_shortcut.xml
@@ -15,28 +15,32 @@
   limitations under the License
   -->
 
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container_layout"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarStyle="outsideOverlay">
+    android:layout_height="wrap_content"
+    android:clipChildren="true">
 
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/container_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="24dp">
+        android:layout_height="match_parent"
+        android:scrollbarStyle="outsideOverlay">
 
-        <include android:id="@+id/software_shortcut"
-            layout="@layout/accessibility_edit_shortcut_component"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp" />
+            android:orientation="vertical"
+            android:padding="24dp">
 
-        <include android:id="@+id/hardware_shortcut"
-            layout="@layout/accessibility_edit_shortcut_component" />
+            <include android:id="@+id/software_shortcut"
+                layout="@layout/accessibility_edit_shortcut_component"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp" />
 
-    </LinearLayout>
+            <include android:id="@+id/hardware_shortcut"
+                layout="@layout/accessibility_edit_shortcut_component" />
 
-</ScrollView>
+        </LinearLayout>
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/accessibility_edit_shortcut_magnification.xml b/res/layout/accessibility_edit_shortcut_magnification.xml
index 31966e3ce4c..725c4c77d79 100644
--- a/res/layout/accessibility_edit_shortcut_magnification.xml
+++ b/res/layout/accessibility_edit_shortcut_magnification.xml
@@ -15,64 +15,69 @@
   limitations under the License
   -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container_layout"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarStyle="outsideOverlay">
+    android:layout_height="wrap_content"
+    android:clipChildren="true">
 
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/container_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="24dp">
-
-        <include
-            android:id="@+id/software_shortcut"
-            layout="@layout/accessibility_edit_shortcut_component"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp" />
-
-        <include
-            android:id="@+id/hardware_shortcut"
-            layout="@layout/accessibility_edit_shortcut_component"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="32dp" />
+        android:layout_height="match_parent"
+        android:scrollbarStyle="outsideOverlay">
 
         <LinearLayout
-            android:id="@+id/advanced_shortcut"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
-            android:orientation="horizontal">
+            android:orientation="vertical"
+            android:padding="24dp">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:contentDescription="@null"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_keyboard_arrow_down" />
-
-            <TextView
+            <include
+                android:id="@+id/software_shortcut"
+                layout="@layout/accessibility_edit_shortcut_component"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:paddingStart="12dp"
-                android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
-                android:textAppearance="?android:attr/textAppearanceListItem"
-                android:textColor="?android:attr/colorAccent"
-                android:textSize="16sp" />
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp" />
+
+            <include
+                android:id="@+id/hardware_shortcut"
+                layout="@layout/accessibility_edit_shortcut_component"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="32dp" />
+
+            <LinearLayout
+                android:id="@+id/advanced_shortcut"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/listPreferredItemHeightSmall"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:contentDescription="@null"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_keyboard_arrow_down" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
+                    android:paddingStart="12dp"
+                    android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
+                    android:textAppearance="?android:attr/textAppearanceListItem"
+                    android:textColor="?android:attr/colorAccent"
+                    android:textSize="16sp" />
+
+            </LinearLayout>
+
+            <include
+                android:id="@+id/triple_tap_shortcut"
+                layout="@layout/accessibility_edit_shortcut_component"
+                android:visibility="gone" />
 
         </LinearLayout>
-
-        <include
-            android:id="@+id/triple_tap_shortcut"
-            layout="@layout/accessibility_edit_shortcut_component"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-</ScrollView>
+    </ScrollView>
+</FrameLayout>
\ No newline at end of file