Merge changes Icc9c36f7,I723474e2 into oc-dev
am: 07525d4f25
Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index 0b0ea720..7fed3e8 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.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 @@
}
};
+ @VisibleForTesting
+ ObjectAnimator getScaleAnimation() {
+ return mScaleAnimation;
+ }
+
private class ViewScaler {
ExpandableView mView;
@@ -176,7 +182,8 @@
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 @@
/**
* @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 @@
* 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 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/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index ba91ffd..b5db78d 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 @@
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 @@
} else {
childViewState.zTranslation = baseZ;
}
+ return childrenOnTop;
}
public void setIsExpanded(boolean isExpanded) {
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 0000000..1b5d4a4
--- /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();
+ }
+
+}