PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TTS for GMT offset

Browse Source 
Add TtsSpans to the GMT offset string so that TalkBack knows to
read it out in a more natural way.

Test: cd tests/robotests && mma
Bug: 30042703
Change-Id: Ifa3c540f086472bc3a315b35ba40c9497f17d2d8
This commit is contained in:
Maurice Lam
2016-10-31 15:38:02 -07:00
parent 8a2e2fa2a7
commit 84b1ceda7c
4 changed files with 189 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/ZonePicker.java
View File

@@ -30,6 +30,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ListView;
import android.widget.SimpleAdapter;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.instrumentation.VisibilityLoggerMixin;
@@ -86,10 +87,15 @@ public class ZonePicker extends ListFragment implements Instrumentable {
*/
public static SimpleAdapter constructTimezoneAdapter(Context context,
boolean sortedByName, int layoutId) {
final String[] from = new String[] {ZoneGetter.KEY_DISPLAYNAME, ZoneGetter.KEY_GMT};
final String[] from = new String[] {
ZoneGetter.KEY_DISPLAY_LABEL,
ZoneGetter.KEY_OFFSET_LABEL
};
final int[] to = new int[] {android.R.id.text1, android.R.id.text2};
final String sortKey = (sortedByName ? ZoneGetter.KEY_DISPLAYNAME : ZoneGetter.KEY_OFFSET);
final String sortKey = (sortedByName
? ZoneGetter.KEY_DISPLAY_LABEL
: ZoneGetter.KEY_OFFSET);
final MyComparator comparator = new MyComparator(sortKey);
final List<Map<String, Object>> sortedList = ZoneGetter.getZonesList(context);
Collections.sort(sortedList, comparator);
@@ -98,10 +104,25 @@ public class ZonePicker extends ListFragment implements Instrumentable {
layoutId,
from,
to);
adapter.setViewBinder(new TimeZoneViewBinder());
return adapter;
}
private static class TimeZoneViewBinder implements SimpleAdapter.ViewBinder {
/**
* Set the text to the given {@link CharSequence} as is, instead of calling toString, so
* that additional information stored in the CharSequence is, like spans added to a
* {@link android.text.SpannableString} are preserved.
*/
@Override
public boolean setViewValue(View view, Object data, String textRepresentation) {
TextView textView = (TextView) view;
textView.setText((CharSequence) data);
return true;
}
}
/**
* Searches {@link TimeZone} from the given {@link SimpleAdapter} object, and returns
* the index for the TimeZone.