diff options
| -rw-r--r-- | packages/SystemUI/res/layout/window_magnifier_view.xml | 9 | ||||
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/SystemUI/res/layout/window_magnifier_view.xml b/packages/SystemUI/res/layout/window_magnifier_view.xml index 6ced97836358..efd24c7d9d4f 100644 --- a/packages/SystemUI/res/layout/window_magnifier_view.xml +++ b/packages/SystemUI/res/layout/window_magnifier_view.xml @@ -17,24 +17,26 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content"> - + android:layout_height="wrap_content" + android:screenReaderFocusable="true"> <View android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="@dimen/magnification_outer_border_margin" + android:importantForAccessibility="no" android:background="@android:color/black"/> <View android:layout_width="match_parent" android:layout_height="match_parent" android:layout_margin="@dimen/magnification_inner_border_margin" + android:importantForAccessibility="no" android:background="@color/magnification_border_color"/> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:importantForAccessibility="noHideDescendants"> <View android:id="@+id/left_handle" @@ -76,6 +78,7 @@ android:layout_margin="@dimen/magnification_outer_border_margin" android:layout_gravity="right|bottom" android:scaleType="center" + android:importantForAccessibility="no" android:src="@drawable/ic_move_magnification"/> </FrameLayout>
\ No newline at end of file diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 9495fb5fdc77..ff794691d2b4 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -730,7 +730,8 @@ public class AccessibilityWindowManager { case WindowManager.LayoutParams.TYPE_SYSTEM_ERROR: case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY: case WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY: - case WindowManager.LayoutParams.TYPE_SCREENSHOT: { + case WindowManager.LayoutParams.TYPE_SCREENSHOT: + case WindowManager.LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY: { return AccessibilityWindowInfo.TYPE_SYSTEM; } |