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

Commit db567ab7 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Jeff DeCew
Browse files

Remove Flag conversation_layout_use_maximum_child_height 


Test: Presubmit
Flag: EXEMPT removal
Former Flag: android.widget.flags.conversation_layout_use_maximum_child_height
Bug: 409606923
Change-Id: If3dd438c3e992dddb0359b62f3cb669d181aeaa0
parent efe14e1e

core/java/android/widget/flags/notification_widget_flags.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -58,16 +58,6 @@ flag { 
  }

}



flag {

  name: "conversation_layout_use_maximum_child_height"

  namespace: "systemui"

  description: "MessagingChild always needs to be measured during MessagingLinearLayout onMeasure."

  bug: "324537506"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "drop_non_existing_messages"

  namespace: "systemui"

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

+14 −17
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.internal.widget;



import static android.app.Flags.notificationsRedesignTemplates;

import static android.widget.flags.Flags.conversationLayoutUseMaximumChildHeight;



import static com.android.internal.widget.MessagingGroup.IMAGE_DISPLAY_LOCATION_EXTERNAL;

import static com.android.internal.widget.MessagingGroup.IMAGE_DISPLAY_LOCATION_INLINE;
@@ -1513,7 +1512,6 @@ public class ConversationLayout extends FrameLayout 
        // FrameLayout measures its match_parent children twice when any of FLs dimension is not

        // specified. However, its sets its own dimensions before the second measurement pass.

        // Content CutOff happens when children have bigger height on its second measurement.

        if (conversationLayoutUseMaximumChildHeight()) {

        int maxHeight = getMeasuredHeight();

        final int count = getChildCount();
@@ -1532,7 +1530,6 @@ public class ConversationLayout extends FrameLayout 
            setMeasuredDimension(getMeasuredWidth(), maxHeight);

        }

    }

    }



    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {