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

Commit 3acdc8e7 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed a crash when expanding 

When expanding another notification while one was finishing
the animation, the system would crash.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java
Change-Id: Icc9c36f7e3bc93ff80f974d400efd3194fa8ed09
Fixes: 36531729
parent daab6f5d

packages/SystemUI/src/com/android/systemui/ExpandHelper.java

+15 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.VelocityTracker; 
import android.view.View;

import android.view.ViewConfiguration;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.ExpandableView;

import com.android.systemui.statusbar.FlingAnimationUtils;
@@ -130,6 +131,11 @@ public class ExpandHelper implements Gefingerpoken { 
        }

    };



    @VisibleForTesting

    ObjectAnimator getScaleAnimation() {

        return mScaleAnimation;

    }



    private class ViewScaler {

        ExpandableView mView;
@@ -176,7 +182,8 @@ public class ExpandHelper implements Gefingerpoken { 
        mFlingAnimationUtils = new FlingAnimationUtils(context, EXPAND_DURATION);

    }



    private void updateExpansion() {

    @VisibleForTesting

    void updateExpansion() {

        if (DEBUG_SCALE) Log.v(TAG, "updateExpansion()");

        // are we scaling or dragging?

        float span = mSGD.getCurrentSpan() - mInitialTouchSpan;
@@ -500,7 +507,8 @@ public class ExpandHelper implements Gefingerpoken { 
    /**

     * @return True if the view is expandable, false otherwise.

     */

    private boolean startExpanding(ExpandableView v, int expandType) {

    @VisibleForTesting

    boolean startExpanding(ExpandableView v, int expandType) {

        if (!(v instanceof ExpandableNotificationRow)) {

            return false;

        }
@@ -535,7 +543,8 @@ public class ExpandHelper implements Gefingerpoken { 
     *                   state

     * @param velocity the velocity this was expanded/ collapsed with

     */

    private void finishExpanding(boolean forceAbort, float velocity) {

    @VisibleForTesting

    void finishExpanding(boolean forceAbort, float velocity) {

        if (!mExpanding) return;



        if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mResizedView);
@@ -571,7 +580,9 @@ public class ExpandHelper implements Gefingerpoken { 
                public void onAnimationEnd(Animator animation) {

                    if (!mCancelled) {

                        mCallback.setUserExpandedChild(scaledView, expand);

                        if (!mExpanding) {

                            mScaler.setView(null);

                        }

                    } else {

                        mCallback.setExpansionCancelled(scaledView);

                    }

packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.systemui;



import android.animation.ObjectAnimator;

import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.support.test.annotation.UiThreadTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.NotificationTestHelper;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class ExpandHelperTest extends SysuiTestCase {



    private ExpandableNotificationRow mRow;

    private ExpandHelper mExpandHelper;

    private ExpandHelper.Callback mCallback;



    @Before

    @UiThreadTest

    public void setUp() {

        Context context = getContext();

        mRow = new NotificationTestHelper(context).createRow();

        mCallback = mock(ExpandHelper.Callback.class);

        mExpandHelper = new ExpandHelper(context, mCallback, 10, 100);

    }



    @Test

    @UiThreadTest

    public void testAnimationDoesntClearViewIfNewExpansionStarted() {

        when(mCallback.getMaxExpandHeight(any())).thenReturn(100);

        mExpandHelper.startExpanding(mRow, 0);

        mExpandHelper.finishExpanding(false, 0);

        mExpandHelper.startExpanding(mRow, 0);

        ObjectAnimator scaleAnimation = mExpandHelper.getScaleAnimation();

        scaleAnimation.end();

        mExpandHelper.updateExpansion();

    }



}