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

Commit 6b2fa067 authored by John Spurlock's avatar John Spurlock Committed by The Android Automerger
Browse files

Volume: Defend against monkeys pulling tags too early. 

Bug: 22197117
Change-Id: I0f944fbc7fd6dd5176300c4fd0fd7b79234efe2d
parent a917e656

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java

+7 −2
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ public class VolumeDialogMotion { 
        return mChevron.getHeight() / 6;

    }



    private int chevronPosY() {

        final Object tag = mChevron == null ? null : mChevron.getTag();

        return tag == null ? 0 : (Integer) tag;

    }



    private void startShowAnimation() {

        if (D.BUG) Log.d(TAG, "startShowAnimation");

        mDialogView.animate()
@@ -139,7 +144,7 @@ public class VolumeDialogMotion { 
                        if (mChevronPositionAnimator == null) return;

                        // reposition chevron

                        final float v = (Float) mChevronPositionAnimator.getAnimatedValue();

                        final int posY = (Integer) mChevron.getTag();

                        final int posY = chevronPosY();

                        mChevron.setTranslationY(posY + v + -mDialogView.getTranslationY());

                    }})

                .start();
@@ -216,7 +221,7 @@ public class VolumeDialogMotion { 
                    @Override

                    public void onAnimationUpdate(ValueAnimator animation) {

                        mContents.setTranslationY(-mDialogView.getTranslationY());

                        int posY = (Integer) mChevron.getTag();

                        final int posY = chevronPosY();

                        mChevron.setTranslationY(posY + -mDialogView.getTranslationY());

                    }

                })