diff --git a/core/java/com/android/internal/widget/ConversationLayout.java b/core/java/com/android/internal/widget/ConversationLayout.java index 16c205a1baf3..e6deada45fc1 100644 --- a/core/java/com/android/internal/widget/ConversationLayout.java +++ b/core/java/com/android/internal/widget/ConversationLayout.java @@ -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 @@ protected void onFinishInflate() { mAppName.setOnVisibilityChangedListener((visibility) -> { onAppNameVisibilityChanged(); }); - mNotificationHeaderSeparatingMargin = getResources().getDimensionPixelSize( - R.dimen.notification_header_separating_margin); } @RemotableViewMethod @@ -1031,7 +1028,6 @@ public boolean onPreDraw() { } 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 @@ private void getRelativeTouchRect(Rect touchRect, View view) { } } - private void updateFeedbackIconMargins() { - MarginLayoutParams lp = (MarginLayoutParams) mFeedbackIcon.getLayoutParams(); - lp.setMarginStart(mNotificationHeaderSeparatingMargin); - mFeedbackIcon.setLayoutParams(lp); - } - public MessagingLinearLayout getMessagingLinearLayout() { return mMessagingLinearLayout; }