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

Commit 045245cb authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Remove "phone" from call chip content description. 

Apps that trigger the call chip may not necessarily be making *phone*
calls, so remove it from the content description.

Bug: 364653005
Flag: EXEMPT bugfix
Test: Trigger call chip -> verify content description is "Ongoing call"
plus the timer amount

Change-Id: I7de89c98bc89d0fe38cc171af8b9ed7d30dd7235
parent 638f31cc

packages/SystemUI/res/layout/ongoing_activity_chip_content.xml

+2 −3
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
<merge

    xmlns:android="http://schemas.android.com/apk/res/android"

    >

    <!-- TODO(b/332662551): Update this content description when this supports more than just

         phone calls. -->



    <com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

        android:id="@+id/ongoing_activity_chip_background"

        android:layout_width="wrap_content"
@@ -34,7 +33,7 @@ 
        <ImageView

            android:src="@*android:drawable/ic_phone"

            android:id="@+id/ongoing_activity_chip_icon"

            android:contentDescription="@string/ongoing_phone_call_content_description"

            android:contentDescription="@string/ongoing_call_content_description"

            android:layout_width="@dimen/ongoing_activity_chip_icon_size"

            android:layout_height="@dimen/ongoing_activity_chip_icon_size"

            android:tint="?android:attr/colorPrimary"

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3354,8 +3354,8 @@ 
    <!-- Accessibility announcement to inform user to unlock using the fingerprint sensor [CHAR LIMIT=NONE] -->

    <string name="accessibility_fingerprint_bouncer">Authentication required. Touch the fingerprint sensor to authenticate.</string>



    <!-- Content description for a chip in the status bar showing that the user is currently on a phone call. [CHAR LIMIT=NONE] -->

    <string name="ongoing_phone_call_content_description">Ongoing phone call</string>

    <!-- Content description for a chip in the status bar showing that the user is currently on a call. [CHAR LIMIT=NONE] -->

    <string name="ongoing_call_content_description">Ongoing call</string>



    <!-- Provider Model: Default title of the mobile network in the mobile layout. [CHAR LIMIT=50] -->

    <string name="mobile_data_settings_title">Mobile data</string>

packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ constructor( 
        private val phoneIcon =

            Icon.Resource(

                com.android.internal.R.drawable.ic_phone,

                ContentDescription.Resource(R.string.ongoing_phone_call_content_description),

                ContentDescription.Resource(R.string.ongoing_call_content_description),

            )

        private val TAG = "CallVM".pad()

    }

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt

+2 −3
Original line number Diff line number Diff line
@@ -149,10 +149,9 @@ object OngoingActivityChipBinder { 
        // 1. Set up the right visual params.

        with(iconView) {

            id = CUSTOM_ICON_VIEW_ID

            // TODO(b/354930838): Update the content description to not include "phone" and maybe

            // include the app name.

            // TODO(b/354930838): For RON chips, use the app name for the content description.

            contentDescription =

                context.resources.getString(R.string.ongoing_phone_call_content_description)

                context.resources.getString(R.string.ongoing_call_content_description)

            tintView(iconTint)

        }