diff --git a/res/layout/accessibility_edit_magnification_shortcut.xml b/res/layout/accessibility_edit_magnification_shortcut.xml index bed1255bde7..5f885b9f747 100644 --- a/res/layout/accessibility_edit_magnification_shortcut.xml +++ b/res/layout/accessibility_edit_magnification_shortcut.xml @@ -25,13 +25,21 @@ android:orientation="vertical" android:padding="24dp"> + + + android:layout_marginBottom="@dimen/accessibility_textview_layout_margin_bottom"/> 16dp 18dp 176dp + + 24dp 16dp diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java index 5d2a3fa9d0a..da3b479a2c6 100644 --- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java +++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java @@ -168,6 +168,7 @@ public class AccessibilityEditDialogUtils { View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM, View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM); } + private static void setEditShortcutButtonsListener(AlertDialog dialog, View.OnClickListener listener) { final View contentView = dialog.findViewById(R.id.container_layout); @@ -215,6 +216,8 @@ public class AccessibilityEditDialogUtils { case DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT: contentView = inflater.inflate( R.layout.accessibility_edit_magnification_shortcut, null); + final ImageView image = contentView.findViewById(R.id.image); + image.setImageResource(retrieveSoftwareShortcutImageResId(context)); break; default: throw new IllegalArgumentException(); @@ -247,7 +250,7 @@ public class AccessibilityEditDialogUtils { final int lineHeight = summary.getLineHeight(); setupShortcutWidget(dialogView, title, retrieveSummary(context, lineHeight), - retrieveImageResId(context)); + retrieveSoftwareShortcutImageResId(context)); } private static void initHardwareShortcut(Context context, View view) { @@ -286,7 +289,7 @@ public class AccessibilityEditDialogUtils { ? getSummaryStringWithLink(context) : getSummaryStringWithIcon(context, lineHeight); } - private static int retrieveImageResId(Context context) { + private static int retrieveSoftwareShortcutImageResId(Context context) { return AccessibilityUtil.isFloatingMenuEnabled(context) ? R.drawable.accessibility_shortcut_type_software_floating : R.drawable.accessibility_shortcut_type_software;