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

Commit 4c00159a authored by Roman Birg's avatar Roman Birg
Browse files

SystemUI: make sure to expand all the way when flinging 



If the panel height changes while an accessibility service pulls down
the status bar (or first time user pulls statusbar down WITH QS tiles
immediately after boot), the height may dynamically change and the
height animator will continue animating down to the original calculated
height.

While expanding the stautsbar down, add a layout listener which ensures
that the height animator's final target is properly set so it smoothly
animates all the way down.

Ref: CYNGNOS-1644

Change-Id: I08f03d9aa556622b5bd39ddcb65a74019dd599e4
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent ed83ebc8

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java

+24 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone; 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.animation.ValueAnimator;

import android.content.Context;

import android.content.res.Configuration;
@@ -26,6 +27,7 @@ import android.content.res.Resources; 
import android.util.AttributeSet;

import android.util.Log;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewTreeObserver;

import android.view.animation.AnimationUtils;
@@ -90,6 +92,20 @@ public abstract class PanelView extends FrameLayout { 


    private final PerformanceManager mPerf;



    private boolean mUpdateExpandOnLayout;

    private View.OnLayoutChangeListener mLayoutChangeListener = new OnLayoutChangeListener() {

        @Override

        public void onLayoutChange(View v, int left, int top, int right, int bottom,

                int oldLeft, int oldTop, int oldRight, int oldBottom) {

            // update expand height

            if (mHeightAnimator != null && mExpanding && mUpdateExpandOnLayout) {

                final int maxPanelHeight = getMaxPanelHeight();

                final PropertyValuesHolder[] values = mHeightAnimator.getValues();

                values[0].setFloatValues(maxPanelHeight);

            }

        }

    };



    /**

     * Whether an instant expand request is currently pending and we are just waiting for layout.

     */
@@ -641,7 +657,7 @@ public abstract class PanelView extends FrameLayout { 
        flingToHeight(vel, expand, target, collapseSpeedUpFactor, expandBecauseOfFalsing);

    }



    protected void flingToHeight(float vel, boolean expand, float target,

    protected void flingToHeight(float vel, final boolean expand, float target,

            float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {

        // Hack to make the expand transition look nice when clear all button is visible - we make

        // the animation only to the last notification, and then jump to the maximum panel height so
@@ -662,6 +678,7 @@ public abstract class PanelView extends FrameLayout { 
            if (expandBecauseOfFalsing) {

                vel = 0;

            }

            mUpdateExpandOnLayout = isFullyCollapsed();

            mFlingAnimationUtils.apply(animator, mExpandedHeight, target, vel, getHeight());

            if (expandBecauseOfFalsing) {

                animator.setDuration(350);
@@ -683,6 +700,11 @@ public abstract class PanelView extends FrameLayout { 
        animator.addListener(new AnimatorListenerAdapter() {

            private boolean mCancelled;



            @Override

            public void onAnimationStart(Animator animation) {

                if (expand) PanelView.this.addOnLayoutChangeListener(mLayoutChangeListener);

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                mCancelled = true;
@@ -690,6 +712,7 @@ public abstract class PanelView extends FrameLayout { 


            @Override

            public void onAnimationEnd(Animator animation) {

                if (expand) PanelView.this.removeOnLayoutChangeListener(mLayoutChangeListener);

                if (clearAllExpandHack && !mCancelled) {

                    setExpandedHeightInternal(getMaxPanelHeight());

                }