diff options
| author | 2018-05-11 17:37:35 +0000 | |
|---|---|---|
| committer | 2018-05-11 17:37:35 +0000 | |
| commit | bb668a2bb7c8f856ba209ecd86cb2e6c18e0a23e (patch) | |
| tree | 71547f2e31d5c53fd88fca5c2c40040e448521ab | |
| parent | 2d2d79b92cdeb0f668c5288652db2f4c23166acf (diff) | |
| parent | 68613694390d42b427462678cb72383f659762ed (diff) | |
Merge "Fix active permission touch target too small" into pi-dev
| -rw-r--r-- | core/res/res/layout/notification_template_header.xml | 7 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml index b7395cdabe09..0697c9758f3c 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 749d3c1c5992..3c5159c89bf6 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> |