From 68613694390d42b427462678cb72383f659762ed Mon Sep 17 00:00:00 2001
From: Dieter Hsu <dieterhsu@google.com>
Date: Thu, 10 May 2018 20:07:52 +0800
Subject: [PATCH] Fix active permission touch target too small

- Set buttons non-clickable to not consume events
- Add a11y contentDescription for active permissions buttons

Bug: 78198386
Test: manually receive messenger video call and verify touch targets
Test: manually record screen and verify with talkback/keyboard
Change-Id: I1b53cd1d7a88e44bd6e188b1055c8572c9d5731d
---
 core/res/res/layout/notification_template_header.xml | 7 ++++++-
 core/res/res/values/strings.xml                      | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml
index b7395cdabe09e..0697c9758f3c4 100644
--- a/core/res/res/layout/notification_template_header.xml
+++ b/core/res/res/layout/notification_template_header.xml
@@ -126,7 +126,6 @@
         android:visibility="gone"
         android:contentDescription="@string/notification_work_profile_content_description"
         />
-
     <LinearLayout
         android:id="@+id/app_ops"
         android:layout_height="match_parent"
@@ -140,6 +139,8 @@
             android:src="@drawable/ic_camera"
             android:background="?android:selectableItemBackgroundBorderless"
             android:visibility="gone"
+            android:clickable="false"
+            android:contentDescription="@string/notification_appops_camera_active"
             />
         <ImageButton
             android:id="@+id/mic"
@@ -149,6 +150,8 @@
             android:background="?android:selectableItemBackgroundBorderless"
             android:layout_marginStart="4dp"
             android:visibility="gone"
+            android:clickable="false"
+            android:contentDescription="@string/notification_appops_microphone_active"
             />
         <ImageButton
             android:id="@+id/overlay"
@@ -158,6 +161,8 @@
             android:background="?android:selectableItemBackgroundBorderless"
             android:layout_marginStart="4dp"
             android:visibility="gone"
+            android:clickable="false"
+            android:contentDescription="@string/notification_appops_overlay_active"
             />
     </LinearLayout>
 </NotificationHeaderView>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index bf7ca524c93e9..989b2728326ba 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4969,6 +4969,14 @@
     <!-- Application name displayed in notifications [CHAR LIMIT=60] -->
     <string name="notification_app_name_settings">Settings</string>
 
+    <!-- Active Permission - accessibility support -->
+    <!-- Content description of the camera icon in the notification. [CHAR LIMIT=NONE] -->
+    <string name="notification_appops_camera_active">Camera</string>
+    <!-- Content description of the mic icon in the notification. [CHAR LIMIT=NONE] -->
+    <string name="notification_appops_microphone_active">Microphone</string>
+    <!-- Content description of the overlay icon in the notification. [CHAR LIMIT=NONE] -->
+    <string name="notification_appops_overlay_active">displaying over other apps on your screen</string>
+
     <!-- Strings for car -->
     <!-- String displayed when loading a user in the car [CHAR LIMIT=30] -->
     <string name="car_loading_profile">Loading</string>