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

Commit 9770336a authored by Dan Zivkovic's avatar Dan Zivkovic Committed by Android (Google) Code Review
Browse files

Merge "Label empty suggestions."

parents 98886775 24c275cc

java/res/values/strings-talkback-descriptions.xml

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
    <!-- Spoken description used during obscured (e.g. password) entry to let the user know that auto-correction will be performed when a key is pressed. -->

    <string name="spoken_auto_correct_obscured"><xliff:g id="KEY_NAME" example="Space">%1$s</xliff:g> performs auto-correction</string>



    <!-- Spoken description of a suggestion when nothing is specified and the field is blank. -->

    <string name="spoken_empty_suggestion">No suggestion</string>



    <!-- Spoken description for unknown keyboard keys. -->

    <string name="spoken_description_unknown">Unknown character</string>

    <!-- Spoken description for the "Shift" keyboard key when "Shift" is off. -->

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java

+12 −6
Original line number Diff line number Diff line
@@ -342,8 +342,11 @@ final class SuggestionStripLayoutHelper { 
     * @param placerView the view where the debug info will be placed.

     * @return the start index of more suggestions.

     */

    public int layoutAndReturnStartIndexOfMoreSuggestions(final SuggestedWords suggestedWords,

            final ViewGroup stripView, final ViewGroup placerView) {

    public int layoutAndReturnStartIndexOfMoreSuggestions(

            final Context context,

            final SuggestedWords suggestedWords,

            final ViewGroup stripView,

            final ViewGroup placerView) {

        if (suggestedWords.isPunctuationSuggestions()) {

            return layoutPunctuationsAndReturnStartIndexOfMoreSuggestions(

                    (PunctuationSuggestions)suggestedWords, stripView);
@@ -362,7 +365,7 @@ final class SuggestionStripLayoutHelper { 
            // by consolidating all slots in the strip.

            final int countInStrip = 1;

            mMoreSuggestionsAvailable = (wordCountToShow > countInStrip);

            layoutWord(mCenterPositionInStrip, stripWidth - mPadding);

            layoutWord(context, mCenterPositionInStrip, stripWidth - mPadding);

            stripView.addView(centerWordView);

            setLayoutWeight(centerWordView, 1.0f, ViewGroup.LayoutParams.MATCH_PARENT);

            if (SuggestionStripView.DBG) {
@@ -385,7 +388,7 @@ final class SuggestionStripLayoutHelper { 
            }



            final int width = getSuggestionWidth(positionInStrip, stripWidth);

            final TextView wordView = layoutWord(positionInStrip, width);

            final TextView wordView = layoutWord(context, positionInStrip, width);

            stripView.addView(wordView);

            setLayoutWeight(wordView, getSuggestionWeight(positionInStrip),

                    ViewGroup.LayoutParams.MATCH_PARENT);
@@ -414,7 +417,7 @@ final class SuggestionStripLayoutHelper { 
     * @param width the maximum width for layout in pixels.

     * @return the {@link TextView} containing the suggested word appropriately formatted.

     */

    private TextView layoutWord(final int positionInStrip, final int width) {

    private TextView layoutWord(final Context context, final int positionInStrip, final int width) {

        final TextView wordView = mWordViews.get(positionInStrip);

        final CharSequence word = wordView.getText();

        if (positionInStrip == mCenterPositionInStrip && mMoreSuggestionsAvailable) {
@@ -428,7 +431,10 @@ final class SuggestionStripLayoutHelper { 
        }

        // {@link StyleSpan} in a content description may cause an issue of TTS/TalkBack.

        // Use a simple {@link String} to avoid the issue.

        wordView.setContentDescription(TextUtils.isEmpty(word) ? null : word.toString());

        wordView.setContentDescription(

                TextUtils.isEmpty(word)

                    ? context.getResources().getString(R.string.spoken_empty_suggestion)

                    : word.toString());

        final CharSequence text = getEllipsizedTextWithSettingScaleX(

                word, width, wordView.getPaint());

        final float scaleX = wordView.getTextScaleX();

java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java

+2 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick 


        for (int pos = 0; pos < SuggestedWords.MAX_SUGGESTIONS; pos++) {

            final TextView word = new TextView(context, null, R.attr.suggestionWordStyle);

            word.setContentDescription(getResources().getString(R.string.spoken_empty_suggestion));

            word.setOnClickListener(this);

            word.setOnLongClickListener(this);

            mWordViews.add(word);
@@ -200,7 +201,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick 
        mStripVisibilityGroup.setLayoutDirection(isRtlLanguage);

        mSuggestedWords = suggestedWords;

        mStartIndexOfMoreSuggestions = mLayoutHelper.layoutAndReturnStartIndexOfMoreSuggestions(

                mSuggestedWords, mSuggestionsStrip, this);

                getContext(), mSuggestedWords, mSuggestionsStrip, this);

        mStripVisibilityGroup.showSuggestionsStrip();

    }