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

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

Merge "Fix unexpected truncation again." into nyc-dev am: ab8913e3 

am: cb5abde8

* commit 'cb5abde8':
  Fix unexpected truncation again.

Change-Id: Id0e7e8f342541874a01cc26116a727c17ee04eb4
parents 6677623c cb5abde8

core/java/android/widget/Editor.java

+10 −11
Original line number Original line Diff line number Diff line
@@ -3251,6 +3251,7 @@ public class Editor { 
        private final SuggestionSpanInfo mMisspelledSpanInfo = new SuggestionSpanInfo();

        private final SuggestionSpanInfo mMisspelledSpanInfo = new SuggestionSpanInfo();

        private int mContainerMarginWidth;

        private int mContainerMarginWidth;

        private int mContainerMarginTop;

        private int mContainerMarginTop;

        private LinearLayout mContainerView;





        private class CustomPopupWindow extends PopupWindow {

        private class CustomPopupWindow extends PopupWindow {

            @Override

            @Override
@@ -3288,20 +3289,19 @@ public class Editor { 
        protected void initContentView() {

        protected void initContentView() {

            final LayoutInflater inflater = (LayoutInflater) mTextView.getContext().

            final LayoutInflater inflater = (LayoutInflater) mTextView.getContext().

                    getSystemService(Context.LAYOUT_INFLATER_SERVICE);

                    getSystemService(Context.LAYOUT_INFLATER_SERVICE);

            final ViewGroup relativeLayout = (ViewGroup) inflater.inflate(

            mContentView = (ViewGroup) inflater.inflate(

                    mTextView.mTextEditSuggestionContainerLayout, null);

                    mTextView.mTextEditSuggestionContainerLayout, null);





            final LinearLayout suggestionWindowContainer =

            mContainerView = (LinearLayout) mContentView.findViewById(

                    (LinearLayout) relativeLayout.findViewById(

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

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

            ViewGroup.MarginLayoutParams lp =

            ViewGroup.MarginLayoutParams lp =

                    (ViewGroup.MarginLayoutParams) suggestionWindowContainer.getLayoutParams();

                    (ViewGroup.MarginLayoutParams) mContainerView.getLayoutParams();

            mContainerMarginWidth = lp.leftMargin + lp.rightMargin;

            mContainerMarginWidth = lp.leftMargin + lp.rightMargin;

            mContainerMarginTop = lp.topMargin;

            mContainerMarginTop = lp.topMargin;

            mClippingLimitLeft = lp.leftMargin;

            mClippingLimitLeft = lp.leftMargin;

            mClippingLimitRight = lp.rightMargin;

            mClippingLimitRight = lp.rightMargin;





            mSuggestionListView = (ListView) relativeLayout.findViewById(

            mSuggestionListView = (ListView) mContentView.findViewById(

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

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





            mSuggestionsAdapter = new SuggestionAdapter();

            mSuggestionsAdapter = new SuggestionAdapter();
@@ -3314,9 +3314,7 @@ public class Editor { 
                mSuggestionInfos[i] = new SuggestionInfo();

                mSuggestionInfos[i] = new SuggestionInfo();

            }

            }





            mContentView = relativeLayout;

            mAddToDictionaryButton = (TextView) mContentView.findViewById(



            mAddToDictionaryButton = (TextView) relativeLayout.findViewById(

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

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

            mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {

            mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {

                public void onClick(View v) {

                public void onClick(View v) {
@@ -3349,7 +3347,7 @@ public class Editor { 
                }

                }

            });

            });





            mDeleteButton = (TextView) relativeLayout.findViewById(

            mDeleteButton = (TextView) mContentView.findViewById(

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

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

            mDeleteButton.setOnClickListener(new View.OnClickListener() {

            mDeleteButton.setOnClickListener(new View.OnClickListener() {

                public void onClick(View v) {

                public void onClick(View v) {
@@ -3461,7 +3459,8 @@ public class Editor { 
            mDeleteButton.measure(horizontalMeasure, verticalMeasure);

            mDeleteButton.measure(horizontalMeasure, verticalMeasure);

            width = Math.max(width, mDeleteButton.getMeasuredWidth());

            width = Math.max(width, mDeleteButton.getMeasuredWidth());





            width += mContainerMarginWidth;

            width += mContainerView.getPaddingLeft() + mContainerView.getPaddingRight()

                    + mContainerMarginWidth;





            // Enforce the width based on actual text widths

            // Enforce the width based on actual text widths

            mContentView.measure(

            mContentView.measure(

core/res/res/layout/text_edit_suggestion_container.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:layout_height="wrap_content">

    android:layout_height="wrap_content">

    <LinearLayout

    <LinearLayout

        android:id="@+id/suggestionWindowContainer"

        android:id="@+id/suggestionWindowContainer"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:orientation="vertical"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

core/res/res/layout/text_edit_suggestion_container_material.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_height="wrap_content">

    android:layout_height="wrap_content">

    <LinearLayout

    <LinearLayout

        android:id="@+id/suggestionWindowContainer"

        android:id="@+id/suggestionWindowContainer"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"

        android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"