nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 5fc93fad: Merge "Add content description to the voice key" 

* commit '5fc93fadd6bfd03ba3d2f535e4e412b09df33016':
  Add content description to the voice key
main
Tadashi G. Takaoka 2014-05-13 07:57:26 +00:00 committed by Android Git Automerger
parent 994f77b8a4 5fc93fadd6
commit 8f8a2d91ef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/layout/suggestions_strip.xml
View File

@ -71,5 +71,6 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:contentDescription="@string/spoken_description_mic"
style="?attr/suggestionWordStyle" /> style="?attr/suggestionWordStyle" />
</merge> </merge>

5
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
View File

@ -381,6 +381,7 @@ final class SuggestionStripLayoutHelper {
} }
// Disable this suggestion if the suggestion is null or empty. // Disable this suggestion if the suggestion is null or empty.
// TODO: Fix disabled {@link TextView}'s content description.
wordView.setEnabled(!TextUtils.isEmpty(word)); wordView.setEnabled(!TextUtils.isEmpty(word));
final CharSequence text = getEllipsizedText(word, width, wordView.getPaint()); final CharSequence text = getEllipsizedText(word, width, wordView.getPaint());
final float scaleX = getTextScaleX(word, width, wordView.getPaint()); final float scaleX = getTextScaleX(word, width, wordView.getPaint());
@ -424,7 +425,9 @@ final class SuggestionStripLayoutHelper {
final int countInStrip) { final int countInStrip) {
// Clear all suggestions first // Clear all suggestions first
for (int positionInStrip = 0; positionInStrip < countInStrip; ++positionInStrip) { for (int positionInStrip = 0; positionInStrip < countInStrip; ++positionInStrip) {
mWordViews.get(positionInStrip).setText(null); final TextView wordView = mWordViews.get(positionInStrip);
wordView.setText(null);
wordView.setTag(null);
// Make this inactive for touches in {@link #layoutWord(int,int)}. // Make this inactive for touches in {@link #layoutWord(int,int)}.
if (SuggestionStripView.DBG) { if (SuggestionStripView.DBG) {
mDebugInfoViews.get(positionInStrip).setText(null); mDebugInfoViews.get(positionInStrip).setText(null);