Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix active permission touch target too small" into pi-dev

Browse Source
This commit is contained in:
Dieter Hsu
2018-05-11 17:37:35 +00:00
committed by Android (Google) Code Review
parent 2d2d79b92c 6861369439
commit bb668a2bb7
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/res/layout/notification_template_header.xml
View File

@@ -126,7 +126,6 @@
android:visibility="gone" android:visibility="gone"
android:contentDescription="@string/notification_work_profile_content_description" android:contentDescription="@string/notification_work_profile_content_description"
/> />
<LinearLayout <LinearLayout
android:id="@+id/app_ops" android:id="@+id/app_ops"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -140,6 +139,8 @@
android:src="@drawable/ic_camera" android:src="@drawable/ic_camera"
android:background="?android:selectableItemBackgroundBorderless" android:background="?android:selectableItemBackgroundBorderless"
android:visibility="gone" android:visibility="gone"
android:clickable="false"
android:contentDescription="@string/notification_appops_camera_active"
/> />
<ImageButton <ImageButton
android:id="@+id/mic" android:id="@+id/mic"
@@ -149,6 +150,8 @@
android:background="?android:selectableItemBackgroundBorderless" android:background="?android:selectableItemBackgroundBorderless"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:visibility="gone" android:visibility="gone"
android:clickable="false"
android:contentDescription="@string/notification_appops_microphone_active"
/> />
<ImageButton <ImageButton
android:id="@+id/overlay" android:id="@+id/overlay"
@@ -158,6 +161,8 @@
android:background="?android:selectableItemBackgroundBorderless" android:background="?android:selectableItemBackgroundBorderless"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:visibility="gone" android:visibility="gone"
android:clickable="false"
android:contentDescription="@string/notification_appops_overlay_active"
/> />
</LinearLayout> </LinearLayout>
</NotificationHeaderView> </NotificationHeaderView>

8
core/res/res/values/strings.xml
View File

@@ -4969,6 +4969,14 @@
<!-- Application name displayed in notifications [CHAR LIMIT=60] --> <!-- Application name displayed in notifications [CHAR LIMIT=60] -->
<string name="notification_app_name_settings">Settings</string> <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 --> <!-- Strings for car -->
<!-- String displayed when loading a user in the car [CHAR LIMIT=30] --> <!-- String displayed when loading a user in the car [CHAR LIMIT=30] -->
<string name="car_loading_profile">Loading</string> <string name="car_loading_profile">Loading</string>