Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak assist disclosure animation" into mnc-dev

Browse Source
This commit is contained in:
Adrian Roos
2015-06-19 23:51:20 +00:00
committed by Android (Google) Code Review
parent 1b98ab3328 c6d3e0e11d
commit b252251144
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/res/interpolator/assist_disclosure_trace.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2015 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
-->
<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
android:controlX1="0.6"
android:controlY1="0"
android:controlX2="0.7"
android:controlY2="1"/>

32
packages/SystemUI/src/com/android/systemui/assist/AssistDisclosure.java
View File

@@ -93,8 +93,9 @@ public class AssistDisclosure {
private class AssistDisclosureView extends View
implements ValueAnimator.AnimatorUpdateListener {
public static final int TRACING_ANIMATION_DURATION = 300;
public static final int ALPHA_ANIMATION_DURATION = 200;
public static final int TRACING_ANIMATION_DURATION = 600;
public static final int ALPHA_IN_ANIMATION_DURATION = 450;
public static final int ALPHA_OUT_ANIMATION_DURATION = 400;
private float mThickness;
private float mShadowThickness;
@@ -102,11 +103,12 @@ public class AssistDisclosure {
private final Paint mShadowPaint = new Paint();
private final ValueAnimator mTracingAnimator;
private final ValueAnimator mAlphaAnimator;
private final ValueAnimator mAlphaOutAnimator;
private final ValueAnimator mAlphaInAnimator;
private final AnimatorSet mAnimator;
private float mTracingProgress = 0;
private int mAlpha = 255;
private int mAlpha = 0;
public AssistDisclosureView(Context context) {
super(context);
@@ -114,13 +116,19 @@ public class AssistDisclosure {
mTracingAnimator = ValueAnimator.ofFloat(0, 1).setDuration(TRACING_ANIMATION_DURATION);
mTracingAnimator.addUpdateListener(this);
mTracingAnimator.setInterpolator(AnimationUtils.loadInterpolator(mContext,
R.interpolator.assist_disclosure_trace));
mAlphaInAnimator = ValueAnimator.ofInt(0, 255).setDuration(ALPHA_IN_ANIMATION_DURATION);
mAlphaInAnimator.addUpdateListener(this);
mAlphaInAnimator.setInterpolator(AnimationUtils.loadInterpolator(mContext,
android.R.interpolator.fast_out_slow_in));
mAlphaAnimator = ValueAnimator.ofInt(255, 0).setDuration(ALPHA_ANIMATION_DURATION);
mAlphaAnimator.addUpdateListener(this);
mAlphaAnimator.setInterpolator(AnimationUtils.loadInterpolator(mContext,
mAlphaOutAnimator = ValueAnimator.ofInt(255, 0).setDuration(
ALPHA_OUT_ANIMATION_DURATION);
mAlphaOutAnimator.addUpdateListener(this);
mAlphaOutAnimator.setInterpolator(AnimationUtils.loadInterpolator(mContext,
android.R.interpolator.fast_out_linear_in));
mAnimator = new AnimatorSet();
mAnimator.play(mTracingAnimator).before(mAlphaAnimator);
mAnimator.play(mAlphaInAnimator).with(mTracingAnimator);
mAnimator.play(mAlphaInAnimator).before(mAlphaOutAnimator);
mAnimator.addListener(new AnimatorListenerAdapter() {
boolean mCancelled;
@@ -167,7 +175,7 @@ public class AssistDisclosure {
mAnimator.cancel();
mTracingProgress = 0;
mAlpha = 255;
mAlpha = 0;
}
private void startAnimation() {
@@ -240,8 +248,10 @@ public class AssistDisclosure {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
if (animation == mAlphaAnimator) {
mAlpha = (int) mAlphaAnimator.getAnimatedValue();
if (animation == mAlphaOutAnimator) {
mAlpha = (int) mAlphaOutAnimator.getAnimatedValue();
} else if (animation == mAlphaInAnimator) {
mAlpha = (int) mAlphaInAnimator.getAnimatedValue();
} else if (animation == mTracingAnimator) {
mTracingProgress = (float) mTracingAnimator.getAnimatedValue();
}