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

Commit 1e99420e authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Fix unexpected ellipsize for long suggestion text." into nyc-dev am: 71208d6f 

am: e40ab5d5

* commit 'e40ab5d5':
  Fix unexpected ellipsize for long suggestion text.
parents 38e036d8 e40ab5d5

core/java/android/widget/Editor.java

+5 −3
Original line number Diff line number Diff line
@@ -3160,6 +3160,7 @@ public class Editor { 
                mTextView.getContext(), mTextView.mTextEditSuggestionHighlightStyle);

        private TextView mAddToDictionaryButton;

        private TextView mDeleteButton;

        private ListView mSuggestionListView;

        private SuggestionSpan mMisspelledSpan;

        private int mContainerMarginWidth;

        private int mContainerMarginTop;
@@ -3213,12 +3214,12 @@ public class Editor { 
            mClippingLimitLeft = lp.leftMargin;

            mClippingLimitRight = lp.rightMargin;



            final ListView suggestionListView = (ListView) relativeLayout.findViewById(

            mSuggestionListView = (ListView) relativeLayout.findViewById(

                    com.android.internal.R.id.suggestionContainer);



            mSuggestionsAdapter = new SuggestionAdapter();

            suggestionListView.setAdapter(mSuggestionsAdapter);

            suggestionListView.setOnItemClickListener(this);

            mSuggestionListView.setAdapter(mSuggestionsAdapter);

            mSuggestionListView.setOnItemClickListener(this);



            // Inflate the suggestion items once and for all.

            mSuggestionInfos = new SuggestionInfo[MAX_NUMBER_SUGGESTIONS];
@@ -3374,6 +3375,7 @@ public class Editor { 
                popupBackground.getPadding(mTempRect);

                width += mTempRect.left + mTempRect.right;

            }

            mSuggestionListView.getLayoutParams().width = width;

            mPopupWindow.setWidth(width);

        }