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

Commit 118f3b5b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge changes Ia6156d7c,I396ac936 into nyc-dev am: 6c5dddfd 

am: 9bb582c1

* commit '9bb582c1':
  Fixed a bug with autoredacted custom views.
  Fixed a bug where notifications could become all white
parents d3abc5e8 9bb582c1

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+10 −6
Original line number Diff line number Diff line
@@ -241,18 +241,22 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    }



    private void updateLimits() {

        boolean customView = getPrivateLayout().getContractedChild().getId()

        updateLimitsForView(mPrivateLayout);

        updateLimitsForView(mPublicLayout);

    }



    private void updateLimitsForView(NotificationContentView layout) {

        boolean customView = layout.getContractedChild().getId()

                != com.android.internal.R.id.status_bar_latest_event_content;

        boolean beforeN = mEntry.targetSdk < Build.VERSION_CODES.N;

        int minHeight = customView && beforeN && !mIsSummaryWithChildren ?

                mNotificationMinHeightLegacy : mNotificationMinHeight;

        boolean headsUpCustom = getPrivateLayout().getHeadsUpChild() != null &&

                getPrivateLayout().getHeadsUpChild().getId()

        boolean headsUpCustom = layout.getHeadsUpChild() != null &&

                layout.getHeadsUpChild().getId()

                        != com.android.internal.R.id.status_bar_latest_event_content;

        int headsUpheight = headsUpCustom && beforeN ? mMaxHeadsUpHeightLegacy

                : mMaxHeadsUpHeight;

        mPrivateLayout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);

        mPublicLayout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);

        layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);

    }



    public StatusBarNotification getStatusBarNotification() {

packages/SystemUI/src/com/android/systemui/statusbar/ViewTransformationHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -188,6 +188,9 @@ public class ViewTransformationHelper implements TransformableView { 


    @Override

    public void setVisible(boolean visible) {

        if (mViewTransformationAnimation != null) {

            mViewTransformationAnimation.cancel();

        }

        for (Integer viewType : mTransformedViews.keySet()) {

            TransformState ownState = getCurrentState(viewType);

            if (ownState != null) {