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

Commit 2eee5395 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Android (Google) Code Review
Browse files

Merge "Remove Flag messaging_child_request_layout" into main

parents 635a0234 9deb4853

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

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

}



flag {

  name: "messaging_child_request_layout"

  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/MessagingLinearLayout.java

+1 −4
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.messagingChildRequestLayout;



import android.annotation.Nullable;

import android.annotation.Px;
@@ -104,9 +103,7 @@ public class MessagingLinearLayout extends ViewGroup { 
            final LayoutParams lp = (LayoutParams) child.getLayoutParams();

            lp.hide = true;

            // Child always needs to be measured to calculate hide property correctly in onMeasure.

            if (messagingChildRequestLayout()) {

            child.requestLayout();

            }

            if (child instanceof MessagingChild) {

                MessagingChild messagingChild = (MessagingChild) child;

                // Whenever we encounter the message first, it's always first in the layout