From daab6f5dbffa2683d5bdb636bd1e618095350c1f Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Thu, 6 Apr 2017 16:46:34 -0700 Subject: [PATCH 1/2] Fixed the visual appearance on heads-up notifications Previously the wrong notifications were displayed on top which could lead to heads-up notifications appearing halfway. Test: manual, add 2 heads-up see that the correct one is displayed Change-Id: I723474e2fe1586e2011a9808f8b8c77a706a6070 Fixes: 36549554 --- .../systemui/statusbar/stack/StackScrollAlgorithm.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java index ba91ffd04c0eb..b5db78d128ff4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -495,12 +495,12 @@ public class StackScrollAlgorithm { int childCount = algorithmState.visibleChildren.size(); float childrenOnTop = 0.0f; for (int i = childCount - 1; i >= 0; i--) { - updateChildZValue(i, childrenOnTop, + childrenOnTop = updateChildZValue(i, childrenOnTop, resultState, algorithmState, ambientState); } } - protected void updateChildZValue(int i, float childrenOnTop, + protected float updateChildZValue(int i, float childrenOnTop, StackScrollState resultState, StackScrollAlgorithmState algorithmState, AmbientState ambientState) { ExpandableView child = algorithmState.visibleChildren.get(i); @@ -538,6 +538,7 @@ public class StackScrollAlgorithm { } else { childViewState.zTranslation = baseZ; } + return childrenOnTop; } public void setIsExpanded(boolean isExpanded) { From 3acdc8e7fc7e4e21f2ffb13b55d258f4a9cc460e Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Thu, 6 Apr 2017 17:38:27 -0700 Subject: [PATCH 2/2] 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 --- .../com/android/systemui/ExpandHelper.java | 19 ++++-- .../android/systemui/ExpandHelperTest.java | 66 +++++++++++++++++++ 2 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index 0b0ea72053d35..7fed3e81682e1 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -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); - mScaler.setView(null); + if (!mExpanding) { + mScaler.setView(null); + } } else { mCallback.setExpansionCancelled(scaledView); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java new file mode 100644 index 0000000000000..1b5d4a4cb9cd7 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java @@ -0,0 +1,66 @@ +/* + * 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(); + } + +}