Merge changes I70299512,I42df29b4 into nyc-dev (c519288b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		mQsContainer = container;
		mQuickQsPanel = quickPanel;
		mQsPanel = panel;
		mQuickQsPanel.addOnLayoutChangeListener(this);
		mQsPanel.addOnLayoutChangeListener(this);
		container.addOnLayoutChangeListener(this);
		QSTileLayout tileLayout = mQsPanel.getTileLayout();
		if (tileLayout instanceof PagedTileLayout) {
		((PagedTileLayout) tileLayout).setPageListener(this);
		@@ -161,6 +160,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

		@Override
		public void onAnimationAtStart() {
		mQuickQsPanel.setVisibility(View.VISIBLE);
		}

		@Override

packages/SystemUI/src/com/android/systemui/qs/TouchAnimator.java

+11 −10

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public class TouchAnimator {
		private final float mSpan;
		private final Interpolator mInterpolator;
		private final Listener mListener;
		private float mLastT;
		private float mLastT = -1;

		private TouchAnimator(Object[] targets, KeyframeSet[] keyframeSets,
		float startDelay, float endDelay, Interpolator interpolator, Listener listener) {
		@@ -56,15 +56,16 @@ public class TouchAnimator {
		if (mInterpolator != null) {
		t = mInterpolator.getInterpolation(t);
		}
		if (mListener != null) {
		if (mLastT == 0 \|\| mLastT == 1) {
		if (t != mLastT) {
		mListener.onAnimationStarted();
		if (t == mLastT) {
		return;
		}
		} else if (t == 1) {
		if (mListener != null) {
		if (t == 1) {
		mListener.onAnimationAtEnd();
		} else if (t == 0) {
		mListener.onAnimationAtStart();
		} else if (mLastT <= 0 \|\| mLastT == 1) {
		mListener.onAnimationStarted();
		}
		mLastT = t;
		}
		@@ -114,12 +115,12 @@ public class TouchAnimator {
		private Listener mListener;

		public Builder addFloat(Object target, String property, float... values) {
		add(target, KeyframeSet.ofFloat(getProperty(target, property), values));
		add(target, KeyframeSet.ofFloat(getProperty(target, property, float.class), values));
		return this;
		}

		public Builder addInt(Object target, String property, int... values) {
		add(target, KeyframeSet.ofInt(getProperty(target, property), values));
		add(target, KeyframeSet.ofInt(getProperty(target, property, int.class), values));
		return this;
		}

		@@ -128,7 +129,7 @@ public class TouchAnimator {
		mValues.add(keyframeSet);
		}

		private static Property getProperty(Object target, String property) {
		private static Property getProperty(Object target, String property, Class<?> cls) {
		if (target instanceof View) {
		switch (property) {
		case "translationX":
		@@ -151,7 +152,7 @@ public class TouchAnimator {
		return View.SCALE_Y;
		}
		}
		return Property.of(target.getClass(), float.class, property);
		return Property.of(target.getClass(), cls, property);
		}

		public Builder setStartDelay(float startDelay) {

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.systemui.qs.QSPanel;
		import com.android.systemui.qs.QSTile;
		import com.android.systemui.qs.QuickQSPanel;
		import com.android.systemui.qs.TouchAnimator;
		import com.android.systemui.qs.TouchAnimator.Listener;
		import com.android.systemui.statusbar.policy.BatteryController;
		import com.android.systemui.statusbar.policy.NextAlarmController;
		import com.android.systemui.statusbar.policy.NextAlarmController.NextAlarmChangeCallback;
		@@ -46,7 +45,7 @@ import com.android.systemui.statusbar.policy.UserInfoController;
		import com.android.systemui.tuner.TunerService;

		public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		NextAlarmChangeCallback, OnClickListener, Listener {
		NextAlarmChangeCallback, OnClickListener {

		private static final String TAG = "QuickStatusBarHeader";

		@@ -157,7 +156,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		mAnimator = new TouchAnimator.Builder()
		.addFloat(mSettingsContainer, "translationY", -mGearTranslation, 0)
		.addFloat(mMultiUserSwitch, "translationY", -mGearTranslation, 0)
		.setListener(this)
		.build();
		mSecondHalfAnimator = new TouchAnimator.Builder()
		.addFloat(mSettingsButton, "rotation", -180, 0)
		@@ -224,20 +222,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
		mExpandIndicator.setExpanded(headerExpansionFraction > EXPAND_INDICATOR_THRESHOLD);
		}

		@Override
		public void onAnimationAtStart() {
		}

		@Override
		public void onAnimationAtEnd() {
		mHeaderQsPanel.setVisibility(View.INVISIBLE);
		}

		@Override
		public void onAnimationStarted() {
		mHeaderQsPanel.setVisibility(View.VISIBLE);
		}

		private void updateAlarmVisibilities() {
		mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);
		mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);

packages/SystemUI/tests/AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@
		<uses-permission android:name="android.permission.INJECT_EVENTS" />
		<uses-permission android:name="android.permission.READ_PHONE_STATE" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
		<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
		<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
		<uses-permission android:name="android.permission.MANAGE_USERS" />

		<application>

packages/SystemUI/tests/src/com/android/systemui/qs/TouchAnimatorTests.java

0 → 100644

+188 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.qs;

		import android.view.View;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.qs.TouchAnimator.Listener;
		import org.mockito.Mockito;

		public class TouchAnimatorTests extends SysuiTestCase {

		private Listener mTouchListener;
		private View mTestView;

		@Override
		protected void setUp() throws Exception {
		super.setUp();

		mTestView = new View(getContext());
		mTouchListener = Mockito.mock(Listener.class);
		}

		public void testSetValueFloat() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.addFloat(mTestView, "x", 0, 50)
		.build();

		animator.setPosition(0);
		assertEquals(0f, mTestView.getX());

		animator.setPosition(.5f);
		assertEquals(25f, mTestView.getX());

		animator.setPosition(1);
		assertEquals(50f, mTestView.getX());
		}

		public void testSetValueInt() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.addInt(mTestView, "top", 0, 50)
		.build();

		animator.setPosition(0);
		assertEquals(0, mTestView.getTop());

		animator.setPosition(.5f);
		assertEquals(25, mTestView.getTop());

		animator.setPosition(1);
		assertEquals(50, mTestView.getTop());
		}

		public void testStartDelay() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.addFloat(mTestView, "x", 0, 50)
		.setStartDelay(.5f)
		.build();

		animator.setPosition(0);
		assertEquals(0f, mTestView.getX());

		animator.setPosition(.5f);
		assertEquals(0f, mTestView.getX());

		animator.setPosition(.75f);
		assertEquals(25f, mTestView.getX());

		animator.setPosition(1);
		assertEquals(50f, mTestView.getX());
		}

		public void testEndDelay() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.addFloat(mTestView, "x", 0, 50)
		.setEndDelay(.5f)
		.build();

		animator.setPosition(0);
		assertEquals(0f, mTestView.getX());

		animator.setPosition(.25f);
		assertEquals(25f, mTestView.getX());

		animator.setPosition(.5f);
		assertEquals(50f, mTestView.getX());

		animator.setPosition(1);
		assertEquals(50f, mTestView.getX());
		}

		public void testOnAnimationAtStartCallback() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.setListener(mTouchListener)
		.build();

		// Called on init.
		animator.setPosition(0);
		verifyOnAnimationAtStart(1);

		// Not called from same state.
		animator.setPosition(0);
		verifyOnAnimationAtStart(1);

		// Called after starting and moving back to start.
		animator.setPosition(.5f);
		animator.setPosition(0);
		verifyOnAnimationAtStart(2);

		// Called when move from end to end.
		animator.setPosition(1);
		animator.setPosition(0);
		verifyOnAnimationAtStart(3);
		}

		public void testOnAnimationAtEndCallback() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.setListener(mTouchListener)
		.build();

		// Called on init.
		animator.setPosition(1);
		verifyOnAnimationAtEnd(1);

		// Not called from same state.
		animator.setPosition(1);
		verifyOnAnimationAtEnd(1);

		// Called after starting and moving back to end.
		animator.setPosition(.5f);
		animator.setPosition(1);
		verifyOnAnimationAtEnd(2);

		// Called when move from end to end.
		animator.setPosition(0);
		animator.setPosition(1);
		verifyOnAnimationAtEnd(3);
		}

		public void testOnAnimationStartedCallback() {
		TouchAnimator animator = new TouchAnimator.Builder()
		.setListener(mTouchListener)
		.build();

		// Called on init.
		animator.setPosition(.5f);
		verifyOnAnimationStarted(1);

		// Not called from same state.
		animator.setPosition(.6f);
		verifyOnAnimationStarted(1);

		// Called after going to end then moving again.
		animator.setPosition(1);
		animator.setPosition(.5f);
		verifyOnAnimationStarted(2);

		// Called after moving to start then moving again.
		animator.setPosition(0);
		animator.setPosition(.5f);
		verifyOnAnimationStarted(3);
		}

		// TODO: Add test for interpolator.

		private void verifyOnAnimationAtStart(int times) {
		Mockito.verify(mTouchListener, Mockito.times(times)).onAnimationAtStart();
		}

		private void verifyOnAnimationAtEnd(int times) {
		Mockito.verify(mTouchListener, Mockito.times(times)).onAnimationAtEnd();
		}

		private void verifyOnAnimationStarted(int times) {
		Mockito.verify(mTouchListener, Mockito.times(times)).onAnimationStarted();
		}
		}