summaryrefslogtreecommitdiff
path: root/InCallUI/res
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-03-02 02:27:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-02 02:27:29 +0000
commitc82ffa7cf29df64f5309f06199e7757ec0b2b9b4 (patch)
tree4ed010d2b87c496acd82fd66fbc843d1859d1970 /InCallUI/res
parent807017f1994cc958ce85d0422de3560a6ba38a1d (diff)
parentae2b330d6860e813ae3ee0f0c0193d726483e38b (diff)
Merge "Provide better talkback for buttons in calling." into nyc-dev
am: ae2b330d68 * commit 'ae2b330d6860e813ae3ee0f0c0193d726483e38b': Provide better talkback for buttons in calling.
Diffstat (limited to 'InCallUI/res')
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml4
-rw-r--r--InCallUI/res/values/strings.xml16
2 files changed, 14 insertions, 6 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index db7576404..6dbfbf73a 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -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 ================================================================= -->
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 2f3d16b73..57a1b5389 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -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 -->