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

Commit b9c0ebc1 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 3fd688fa: Merge changes Ifad4bd65,I6a4b7d69 into jb-mr1-dev 

* commit '3fd688fa':
  Turn off an assert.
  Fix crash in SystemUI.
parents fe1d3d4c 3fd688fa

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -101,8 +101,7 @@ public class GestureRecorder { 
                mDownTime = ev.getDownTime();

                mDownTime = ev.getDownTime();

            } else {

            } else {

                if (mDownTime != ev.getDownTime()) {

                if (mDownTime != ev.getDownTime()) {

                    // TODO: remove

                    Slog.w(TAG, "Assertion failure in GestureRecorder: event downTime ("

                    throw new RuntimeException("Assertion failure in GestureRecorder: event downTime ("

                            +ev.getDownTime()+") does not match gesture downTime ("+mDownTime+")");

                            +ev.getDownTime()+") does not match gesture downTime ("+mDownTime+")");

                }

                }

            }

            }

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -59,6 +59,11 @@ public class PanelView extends FrameLayout { 
        }

        }

    };

    };





    private final Runnable mStopAnimator = new Runnable() { public void run() {

        if (mTimeAnimator.isStarted()) {

            mTimeAnimator.end(); }

    }};



    private float mVel, mAccel;

    private float mVel, mAccel;

    private int mFullHeight = 0;

    private int mFullHeight = 0;

    private String mViewName; 

    private String mViewName;
@@ -117,7 +122,7 @@ public class PanelView extends FrameLayout { 
            if (mVel == 0

            if (mVel == 0

                    || (closing && mExpandedHeight == 0)

                    || (closing && mExpandedHeight == 0)

                    || (!closing && mExpandedHeight == getFullHeight())) {

                    || (!closing && mExpandedHeight == getFullHeight())) {

                mTimeAnimator.end();

                post(mStopAnimator);

            }

            }

        }

        }

    }

    }
@@ -277,7 +282,7 @@ public class PanelView extends FrameLayout { 








    public void setExpandedHeight(float height) {

    public void setExpandedHeight(float height) {

        mTimeAnimator.end();

        post(mStopAnimator);

        setExpandedHeightInternal(height);

        setExpandedHeightInternal(height);

    }

    }