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

Commit 1ad9fa08 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe2434 

am: 389c4e67

* commit '389c4e67':
  Notification: Fix bug with sliding action list

Change-Id: I1f88be59b92aa86b9a130b21cc3ebce4afd670b7
parents be120aad 389c4e67

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

+8 −3
Original line number Diff line number Diff line
@@ -403,12 +403,17 @@ public class NotificationContentView extends FrameLayout { 
            return mContext.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.notification_action_list_height);

        }

        int hint;

        if (mHeadsUpChild != null) {

            return mHeadsUpChild.getHeight();

            hint = mHeadsUpChild.getHeight();

        } else {

            return mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize(

            hint = mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.notification_action_list_height);

        }

        if (mExpandedChild != null) {

            hint = Math.min(hint, mExpandedChild.getHeight());

        }

        return hint;

    }



    private void updateContentTransformation() {