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

Merge "Fixing small regression in clear-all button and scrim alpha animation." into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-03-31 23:05:47 +00:00
committed by Android (Google) Code Review
parent d37577d109 47c78f93c2
commit 0b0b9a5e80
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
View File

@@ -343,7 +343,7 @@ public class RecentsView extends FrameLayout {
if (RecentsDebugFlags.Static.EnableStackActionButton) { if (RecentsDebugFlags.Static.EnableStackActionButton) {
// Measure the stack action button within the constraints of the space above the stack // Measure the stack action button within the constraints of the space above the stack
Rect buttonBounds = getStackActionButtonBoundsFromStackLayout(); Rect buttonBounds = mTaskStackView.mLayoutAlgorithm.mStackActionButtonRect;
measureChild(mStackActionButton, measureChild(mStackActionButton,
MeasureSpec.makeMeasureSpec(buttonBounds.width(), MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(buttonBounds.width(), MeasureSpec.AT_MOST),
MeasureSpec.makeMeasureSpec(buttonBounds.height(), MeasureSpec.AT_MOST)); MeasureSpec.makeMeasureSpec(buttonBounds.height(), MeasureSpec.AT_MOST));
@@ -729,13 +729,15 @@ public class RecentsView extends FrameLayout {
*/ */
private void animateBackgroundScrim(float alpha, int duration) { private void animateBackgroundScrim(float alpha, int duration) {
Utilities.cancelAnimationWithoutCallbacks(mBackgroundScrimAnimator); Utilities.cancelAnimationWithoutCallbacks(mBackgroundScrimAnimator);
int alphaInt = (int) (alpha * 255); // Calculate the absolute alpha to animate from
int fromAlpha = (int) ((mBackgroundScrim.getAlpha() / (DEFAULT_SCRIM_ALPHA * 255)) * 255);
int toAlpha = (int) (alpha * 255);
mBackgroundScrimAnimator = ObjectAnimator.ofInt(mBackgroundScrim, Utilities.DRAWABLE_ALPHA, mBackgroundScrimAnimator = ObjectAnimator.ofInt(mBackgroundScrim, Utilities.DRAWABLE_ALPHA,
mBackgroundScrim.getAlpha(), alphaInt); fromAlpha, toAlpha);
mBackgroundScrimAnimator.setDuration(duration); mBackgroundScrimAnimator.setDuration(duration);
mBackgroundScrimAnimator.setInterpolator(alphaInt > mBackgroundScrim.getAlpha() mBackgroundScrimAnimator.setInterpolator(toAlpha > fromAlpha
? Interpolators.ALPHA_OUT ? Interpolators.ALPHA_IN
: Interpolators.ALPHA_IN); : Interpolators.ALPHA_OUT);
mBackgroundScrimAnimator.start(); mBackgroundScrimAnimator.start();
} }
@@ -750,7 +752,8 @@ public class RecentsView extends FrameLayout {
- mStackActionButton.getMeasuredWidth(); - mStackActionButton.getMeasuredWidth();
int top = actionButtonRect.top + int top = actionButtonRect.top +
(actionButtonRect.height() - mStackActionButton.getMeasuredHeight()) / 2; (actionButtonRect.height() - mStackActionButton.getMeasuredHeight()) / 2;
actionButtonRect.offsetTo(left, top); actionButtonRect.set(left, top, left + mStackActionButton.getMeasuredWidth(),
top + mStackActionButton.getMeasuredHeight());
return actionButtonRect; return actionButtonRect;
} }
} }