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

Commit 16a215c3 authored by Qi Wang's avatar Qi Wang
Browse files

Provide better talkback for buttons in calling. 

1. Announce "unmute" if the mute button is checked
2. Annouce "hide dialpad" if the show dialpad button is checked.

Bug: 24296610
Change-Id: Idc3b78e49ca5ef2c01b2ab671b5e34ba54cc4f4e
parent 008c82f4

InCallUI/res/layout/call_button_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
        <ToggleButton android:id="@+id/muteButton"

            style="@style/InCallCompoundButton"

            android:background="@drawable/btn_compound_mute"

            android:contentDescription="@string/onscreenMuteText" />

            android:contentDescription="@string/onscreenMuteText_unselected" />



        <!-- CENTER SLOT ======================================================================= -->
@@ -83,7 +83,7 @@ 
        <ToggleButton android:id="@+id/dialpadButton"

            style="@style/InCallCompoundButton"

            android:background="@drawable/btn_compound_dialpad"

            android:contentDescription="@string/onscreenShowDialpadText" />

            android:contentDescription="@string/onscreenShowDialpadText_unselected" />



        <!-- MIDDLE RIGHT SLOT ================================================================= -->

InCallUI/res/values/strings.xml

+12 −4
Original line number Diff line number Diff line
@@ -275,10 +275,18 @@ 
    <string name="onscreenHoldText_selected">Resume Call</string>

    <!-- Text for the onscreen "End call" button -->

    <string name="onscreenEndCallText">End Call</string>

    <!-- Text for the onscreen "Show Dialpad" button -->

    <string name="onscreenShowDialpadText">Dialpad</string>

    <!-- Text for the onscreen "Mute" button -->

    <string name="onscreenMuteText">Mute</string>

    <!-- Text for the onscreen "Show Dialpad" button when it is not selected. Pressing it will

         show the dialpad. -->

    <string name="onscreenShowDialpadText_unselected">Show Dialpad</string>

    <!-- Text for the onscreen "Show Dialpad" button when it is selected. Pressing it will

         hide the dialpad. -->

    <string name="onscreenShowDialpadText_selected">Hide Dialpad</string>

    <!-- Text for the onscreen "Mute" button when it is not selected. Pressing it will mute

         the call. -->

    <string name="onscreenMuteText_unselected">Mute</string>

    <!-- Text for the onscreen "Mute" button when it is selected. Pressing it will unmute

         the call. -->

    <string name="onscreenMuteText_selected">Unmute</string>

    <!-- Text for the onscreen "Add call" button -->

    <string name="onscreenAddCallText">Add call</string>

    <!-- Text for the onscreen "Merge calls" button -->

InCallUI/src/com/android/incallui/CallButtonFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -433,6 +433,9 @@ public class CallButtonFragment 
    public void setMute(boolean value) {

        if (mMuteButton.isSelected() != value) {

            mMuteButton.setSelected(value);

            mMuteButton.setContentDescription(getContext().getString(

                    value ? R.string.onscreenMuteText_selected

                            : R.string.onscreenMuteText_unselected));

        }

    }
@@ -789,6 +792,9 @@ public class CallButtonFragment 
            boolean changed = ((InCallActivity) getActivity()).showDialpadFragment(value, animate);

            if (changed) {

                mShowDialpadButton.setSelected(value);

                mShowDialpadButton.setContentDescription(getContext().getString(

                        value /* show */ ? R.string.onscreenShowDialpadText_unselected

                                : R.string.onscreenShowDialpadText_selected));

            }

        }

    }