Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a0d4f3 authored by Dieter Hsu's avatar Dieter Hsu Committed by android-build-merger
Browse files

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

am: bb668a2b

Change-Id: I92aa46fd58e565a40ae7ccb52b76e9567cced2a9
parents 24ef8f99 bb668a2b

core/res/res/layout/notification_template_header.xml

+6 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -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>