diff options
author | yueg <yueg@google.com> | 2017-12-18 10:01:03 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-18 14:30:53 -0800 |
commit | 0b4755ce85588114e2f4a6a41205a0ec9acc28dd (patch) | |
tree | 20a887ef2a019e8ad0c6b85dff134a6d8df5631f /java/com/android/newbubble/RoundedRectRevealOutlineProvider.java | |
parent | 01de7aaefd290672eeb1ff0c6601466590cd9563 (diff) |
Bubble v2 animation change.
When expand/collapse, use RoundedRectRevealOutlineProvider to reveal/unreveal
from top left or top right corner. It's similar to app icon popup in Pixel 2.
And animate this together with bubble moving to the middle. Also reduce animation duration.
Bug: 67605985
Test: manual
PiperOrigin-RevId: 179435867
Change-Id: I58557f77d0db167dc9d2a2dadeb5bc4cfa16702f
Diffstat (limited to 'java/com/android/newbubble/RoundedRectRevealOutlineProvider.java')
-rw-r--r-- | java/com/android/newbubble/RoundedRectRevealOutlineProvider.java | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/java/com/android/newbubble/RoundedRectRevealOutlineProvider.java b/java/com/android/newbubble/RoundedRectRevealOutlineProvider.java new file mode 100644 index 000000000..d204e0f1c --- /dev/null +++ b/java/com/android/newbubble/RoundedRectRevealOutlineProvider.java @@ -0,0 +1,105 @@ +/* + * 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.newbubble; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ValueAnimator; +import android.graphics.Outline; +import android.graphics.Rect; +import android.view.View; +import android.view.ViewOutlineProvider; + +/** + * A {@link ViewOutlineProvider} that provides an outline that interpolates between two radii and + * two {@link Rect}s. + * + * <p>An example usage of this provider is an outline that starts out as a circle and ends as a + * rounded rectangle. + */ +public class RoundedRectRevealOutlineProvider extends ViewOutlineProvider { + private final float mStartRadius; + private final float mEndRadius; + + private final Rect mStartRect; + private final Rect mEndRect; + + private final Rect mOutline; + private float mOutlineRadius; + + public RoundedRectRevealOutlineProvider( + float startRadius, float endRadius, Rect startRect, Rect endRect) { + mStartRadius = startRadius; + mEndRadius = endRadius; + mStartRect = startRect; + mEndRect = endRect; + + mOutline = new Rect(); + } + + @Override + public void getOutline(View v, Outline outline) { + outline.setRoundRect(mOutline, mOutlineRadius); + } + + /** Sets the progress, from 0 to 1, of the reveal animation. */ + public void setProgress(float progress) { + mOutlineRadius = (1 - progress) * mStartRadius + progress * mEndRadius; + + mOutline.left = (int) ((1 - progress) * mStartRect.left + progress * mEndRect.left); + mOutline.top = (int) ((1 - progress) * mStartRect.top + progress * mEndRect.top); + mOutline.right = (int) ((1 - progress) * mStartRect.right + progress * mEndRect.right); + mOutline.bottom = (int) ((1 - progress) * mStartRect.bottom + progress * mEndRect.bottom); + } + + ValueAnimator createRevealAnimator(final View revealView, boolean isReversed) { + ValueAnimator valueAnimator = + isReversed ? ValueAnimator.ofFloat(1f, 0f) : ValueAnimator.ofFloat(0f, 1f); + + valueAnimator.addListener( + new AnimatorListenerAdapter() { + private boolean mWasCanceled = false; + + @Override + public void onAnimationStart(Animator animation) { + revealView.setOutlineProvider(RoundedRectRevealOutlineProvider.this); + revealView.setClipToOutline(true); + } + + @Override + public void onAnimationCancel(Animator animation) { + mWasCanceled = true; + } + + @Override + public void onAnimationEnd(Animator animation) { + if (!mWasCanceled) { + revealView.setOutlineProvider(ViewOutlineProvider.BACKGROUND); + revealView.setClipToOutline(false); + } + } + }); + + valueAnimator.addUpdateListener( + (currentValueAnimator) -> { + float progress = (Float) currentValueAnimator.getAnimatedValue(); + setProgress(progress); + revealView.invalidateOutline(); + }); + return valueAnimator; + } +} |