diff options
author | Nancy Chen <nancychen@google.com> | 2014-11-25 18:16:06 -0800 |
---|---|---|
committer | Nancy Chen <nancychen@google.com> | 2014-12-01 15:01:11 -0800 |
commit | acfbbad50f8b4c2524fdd63e362a8f20704c661a (patch) | |
tree | cc1102c2bc328807a176fc5a8afd239e418546b3 /src | |
parent | 4dbd3a2366c14fca1a514a9e7cfe383e0c28f3b3 (diff) |
On MSIM devices, include account from call log in talkback.
In TalkBack mode, when a user taps on a call log entry, it should read
back the name of the SIM/account used for the call. The string used is
"on <phoneAccount>".
Also add back periods removed in the string updates because they are
needed for verbal stopping points in TalkBack mode.
Bug:18517912
Change-Id: Iaadbd859ef980ca030f9fb60d3395ca057e8cefc
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogListItemHelper.java | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/com/android/dialer/calllog/CallLogListItemHelper.java b/src/com/android/dialer/calllog/CallLogListItemHelper.java index 1eb25fbfa..4ebfb4b88 100644 --- a/src/com/android/dialer/calllog/CallLogListItemHelper.java +++ b/src/com/android/dialer/calllog/CallLogListItemHelper.java @@ -105,7 +105,7 @@ import com.android.dialer.R; * Returns the accessibility description of the "return call/call" action for a call log * entry. * Accessibility text is a combination of: - * {Voicemail Prefix}. {Number of Calls}. {Caller information}. + * {Voicemail Prefix}. {Number of Calls}. {Caller information} {Phone Account}. * If most recent call is a voicemail, {Voicemail Prefix} is "New Voicemail.", otherwise "". * * If more than one call for the caller, {Number of Calls} is: @@ -124,9 +124,13 @@ import com.android.dialer.R; * {Call type} is the contact phone number type (eg mobile) or location. * {Call Time} is the time since the last call for the contact occurred. * + * The {Phone Account} refers to the account/SIM through which the call was placed or received + * in multi-SIM devices. + * * Examples: - * 3 calls. New Voicemail. Missed call from Joe Smith mobile 2 hours ago. - * 2 calls. Answered call from John Doe mobile. Last called 1 hour ago. + * 3 calls. New Voicemail. Missed call from Joe Smith mobile 2 hours ago on SIM 1. + * + * 2 calls. Answered call from John Doe mobile 1 hour ago. * * @param context The application context. * @param details Details of call. @@ -165,13 +169,16 @@ import com.android.dialer.R; } int stringID = getCallDescriptionStringID(details); + String accountLabel = PhoneAccountUtils.getAccountLabel(context, details.accountHandle); // Use chosen string resource to build up the message. callDescription.append(mResources.getString(stringID, nameOrNumber, // If no type or location can be determined, sub in empty string. typeOrLocation == null ? "" : typeOrLocation, - timeOfCall)); + timeOfCall, + accountLabel == null ? "" : + mResources.getString(R.string.description_phone_account, accountLabel))); return callDescription; } @@ -187,13 +194,15 @@ import com.android.dialer.R; int stringID; if (lastCallType == Calls.VOICEMAIL_TYPE || lastCallType == Calls.MISSED_TYPE) { - //Message: Missed call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>. + //Message: Missed call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>, + //<PhoneAccount>. stringID = R.string.description_incoming_missed_call; } else if (lastCallType == Calls.INCOMING_TYPE) { - //Message: Answered call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>. + //Message: Answered call from <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>, + //<PhoneAccount>. stringID = R.string.description_incoming_answered_call; } else { - //Message: Call to <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>. + //Message: Call to <NameOrNumber>, <TypeOrLocation>, <TimeOfCall>, <PhoneAccount>. stringID = R.string.description_outgoing_call; } return stringID; |