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

Commit 87e78d4d authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant margin update, which caused infinite layout loop."... 

Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev am: a39cdd12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805375

Change-Id: I29d07b8eb7d1c5952513476a3f2289691fbeb13d
parents 002a8979 a39cdd12

core/java/com/android/internal/widget/ConversationLayout.java

+0 −10
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ public class ConversationLayout extends FrameLayout 
    private Icon mShortcutIcon;

    private View mAppNameDivider;

    private TouchDelegateComposite mTouchDelegate = new TouchDelegateComposite(this);

    private int mNotificationHeaderSeparatingMargin;



    public ConversationLayout(@NonNull Context context) {

        super(context);
@@ -284,8 +283,6 @@ public class ConversationLayout extends FrameLayout 
        mAppName.setOnVisibilityChangedListener((visibility) -> {

            onAppNameVisibilityChanged();

        });

        mNotificationHeaderSeparatingMargin = getResources().getDimensionPixelSize(

                R.dimen.notification_header_separating_margin);

    }



    @RemotableViewMethod
@@ -1031,7 +1028,6 @@ public class ConversationLayout extends FrameLayout 
        }

        mTouchDelegate.clear();

        if (mFeedbackIcon.getVisibility() == VISIBLE) {

            updateFeedbackIconMargins();

            float width = Math.max(mMinTouchSize, mFeedbackIcon.getWidth());

            float height = Math.max(mMinTouchSize, mFeedbackIcon.getHeight());

            final Rect feedbackTouchRect = new Rect();
@@ -1057,12 +1053,6 @@ public class ConversationLayout extends FrameLayout 
        }

    }



    private void updateFeedbackIconMargins() {

        MarginLayoutParams lp = (MarginLayoutParams) mFeedbackIcon.getLayoutParams();

        lp.setMarginStart(mNotificationHeaderSeparatingMargin);

        mFeedbackIcon.setLayoutParams(lp);

    }



    public MessagingLinearLayout getMessagingLinearLayout() {

        return mMessagingLinearLayout;

    }