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

Commit a421cb58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call adjustSpacingForImage only when showing the image" into main

parents 6c3314e3 eb3faf68

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

+3 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import android.widget.ImageView; 
import android.widget.LinearLayout;

import android.widget.RemoteViews;

import android.widget.TextView;

import android.widget.flags.Flags;



import com.android.internal.R;

import com.android.internal.widget.ConversationAvatarData.GroupConversationAvatarData;
@@ -724,8 +723,10 @@ public class ConversationLayout extends FrameLayout 
                mRightIconView.setVisibility(GONE);

            }

        }

        if (isShowingImage) {

            adjustSpacingForImage();

        }

    }



    /**

     * When showing an isolated image message similar to the large icon, adjust the margin of the

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

+3 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.widget.FrameLayout; 
import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.RemoteViews;

import android.widget.flags.Flags;



import com.android.internal.R;
@@ -435,8 +434,10 @@ public class MessagingLayout extends FrameLayout 
                mRightIconView.setVisibility(GONE);

            }

        }

        if (isShowingImage) {

            adjustSpacingForImage();

        }

    }



    /**

     * When showing an isolated image message similar to the large icon, adjust the margin of the