From 08ac9c12462b224cac31043d25f49fffa1f6a48f Mon Sep 17 00:00:00 2001
From: Chengfei Tao <chengfeitao@google.com>
Date: Sun, 29 Jan 2023 12:16:19 +0800
Subject: [PATCH] Accessibility toggle button small tappable area fix

Revert part of the layout change from b/233835795 fix so that
the issue of small tappable area in b/265859032 is fixed while
we continue to look at a better fix for b/233835795

Test: Manually change different Display & Font size to test UI
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.biometrics.face.FaceEnrollEducationTest"

Bug: 265859032

Change-Id: I90ba7cc11dc61380dfdf0c3bcd2c59a17b43ee0e
---
 res/layout/face_enroll_education.xml | 3 +--
 res/values/dimens.xml                | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index 908dae4f7f1..1f9696e2297 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -84,8 +84,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/limited_vision_button_frame_margin_top">
+                android:layout_height="wrap_content">
 
                 <Button
                     android:id="@+id/accessibility_button"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5992a613b4f..f8d3e5013a2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -525,7 +525,6 @@
     <dimen name="illustration_accessibility_margin_top">0dp</dimen>
     <dimen name="face_enroll_education_lottie_frame_margin_top">-24dp</dimen>
     <dimen name="lottie_animation_view_margin_top">-52dp</dimen>
-    <dimen name="limited_vision_button_frame_margin_top">-24dp</dimen>
     <dimen name="limited_vision_button_margin_top">0dp</dimen>
     <dimen name="limited_vision_button_margin_bottom">0dp</dimen>
     <dimen name="limited_vision_button_toggle_margin_top">0dp</dimen>