commit b5a0ff7ee93da90dda28cef804dd349f384aff9d
author Menghan Li <menghanli@google.com> Tue Apr 14 22:12:46 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 22:12:46 2020 +0000
tree 0ca523fba7e1f8f7b7674896c439b173e8a2c4de
parent 60fd3c13ad0df907f2a37fec377144a400fc1808
parent 28243367dfadd7933f4d1285587738b2bac1bd6f

Merge "Fine tune the maganication area edit dialog" into rvc-dev

res/layout/accessibility_edit_magnification_mode.xml

diff --git a/res/layout/accessibility_edit_magnification_mode.xml b/res/layout/accessibility_edit_magnification_mode.xml
index bdc355d..e4f3132 100644
--- a/res/layout/accessibility_edit_magnification_mode.xml
+++ b/res/layout/accessibility_edit_magnification_mode.xml
@@ -28,12 +28,19 @@
         android:padding="24dp">
 
         <TextView
-            style="@style/AccessibilityDialogDescription"
-            android:text="@string/accessibility_magnification_area_settings_message" />
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/accessibility_magnification_area_settings_message"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_marginBottom="24dp"/>
 
         <include
             android:id="@+id/magnify_full_screen"
-            layout="@layout/accessibility_edit_shortcut_component" />
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp" />
 
         <include
             android:id="@+id/magnify_window_screen"

res/layout/accessibility_edit_shortcut_component.xml

diff --git a/res/layout/accessibility_edit_shortcut_component.xml b/res/layout/accessibility_edit_shortcut_component.xml
index 074a878..d257be6 100644
--- a/res/layout/accessibility_edit_shortcut_component.xml
+++ b/res/layout/accessibility_edit_shortcut_component.xml
@@ -57,6 +57,6 @@
         android:layout_width="176dp"
         android:layout_height="176dp"
         android:layout_marginStart="44dp"
-        android:scaleType="centerCrop" />
+        android:scaleType="fitCenter" />
 
 </LinearLayout>