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

Commit 2f4a82af authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a big with the vetobutton, circumventing double tapping."

parents e704324a 863834bd

packages/SystemUI/res/layout/status_bar_notification_row.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    <Button

        android:id="@+id/veto"

        android:layout_width="48dp"

        android:layout_height="8dp"

        android:layout_height="0dp"

        android:gravity="end"

        android:layout_marginEnd="-80dp"

        android:background="@null"

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

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
                AnimationUtils.loadInterpolator(context, android.R.interpolator.fast_out_slow_in);

        mLinearOutSlowInInterpolator =

                AnimationUtils.loadInterpolator(context, android.R.interpolator.linear_out_slow_in);

        mMaxNotificationHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height);

        mMaxNotificationHeight = getResources().getDimensionPixelSize(

                R.dimen.notification_max_height);

        setClipChildren(false);

        setClipToPadding(false);

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    private NotificationContentView mPrivateLayout;

    private int mMaxExpandHeight;

    private boolean mIsBelowSpeedBump;

    private View mVetoButton;



    public ExpandableNotificationRow(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -63,6 +64,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        super.onFinishInflate();

        mPublicLayout = (NotificationContentView) findViewById(R.id.expandedPublic);

        mPrivateLayout = (NotificationContentView) findViewById(R.id.expanded);

        mVetoButton = findViewById(R.id.veto);

    }



    @Override
@@ -256,4 +258,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
    public void notifyContentUpdated() {

        mPrivateLayout.notifyContentUpdated();

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        int newHeightSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.EXACTLY);

        mVetoButton.measure(widthMeasureSpec, newHeightSpec);

    }

}