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

Merge "Fixing issue with front task dimming when scrolled back." into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-02-16 00:54:16 +00:00
committed by Android (Google) Code Review
parent 9c6d9753a0 be8f35747c
commit 61ce27d3e9
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values-sw720dp/dimens.xml
View File

@@ -32,7 +32,7 @@
<!-- The radius of the rounded corners on a task view. -->
<dimen name="recents_task_view_rounded_corners_radius">3dp</dimen>
<!-- The radius of the rounded corners on a task view's shadow. -->
<dimen name="recents_task_view_shadow_rounded_corners_radius">18dp</dimen>
<dimen name="recents_task_view_shadow_rounded_corners_radius">12dp</dimen>
<!-- The fraction of the screen height where the clock on the Keyguard has its center. The
max value is used when no notifications are displaying, and the min value is when the

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

@@ -693,6 +693,11 @@ public class TaskStackLayoutAlgorithm {
SystemServicesProxy ssp = Recents.getSystemServices();
// Compute the focused and unfocused offset
float boundedStackScroll = Utilities.clamp(stackScroll, mMinScrollP, mMaxScrollP);
mUnfocusedRange.offset(boundedStackScroll);
mFocusedRange.offset(boundedStackScroll);
float boundedScrollUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress);
float boundedScrollFocusedRangeX = mFocusedRange.getNormalizedX(taskProgress);
mUnfocusedRange.offset(stackScroll);
mFocusedRange.offset(stackScroll);
boolean unfocusedVisible = mUnfocusedRange.isInRange(taskProgress);
@@ -729,15 +734,17 @@ public class TaskStackLayoutAlgorithm {
unfocusedRangeX)) * mStackRect.height());
int focusedY = (int) ((1f - mFocusedCurveInterpolator.getInterpolation(
focusedRangeX)) * mStackRect.height());
float unfocusedDim = 1f - UNFOCUSED_DIM_INTERPOLATOR.getInterpolation(unfocusedRangeX);
float focusedDim = 1f - FOCUSED_DIM_INTERPOLATOR.getInterpolation(focusedRangeX);
float unfocusedDim = 1f - UNFOCUSED_DIM_INTERPOLATOR.getInterpolation(
boundedScrollUnfocusedRangeX);
float focusedDim = 1f - FOCUSED_DIM_INTERPOLATOR.getInterpolation(
boundedScrollFocusedRangeX);
y = (mStackRect.top - mTaskRect.top) +
(int) Utilities.mapRange(focusState, unfocusedY, focusedY);
z = Utilities.mapRange(Utilities.clamp01(unfocusedRangeX), mMinTranslationZ,
mMaxTranslationZ);
z = Utilities.mapRange(Utilities.clamp01(boundedScrollUnfocusedRangeX),
mMinTranslationZ, mMaxTranslationZ);
dimAlpha = DIM_MAX_VALUE * Utilities.mapRange(focusState, unfocusedDim, focusedDim);
viewOutlineAlpha = Utilities.mapRange(Utilities.clamp01(unfocusedRangeX),
viewOutlineAlpha = Utilities.mapRange(Utilities.clamp01(boundedScrollUnfocusedRangeX),
OUTLINE_ALPHA_MIN_VALUE, OUTLINE_ALPHA_MAX_VALUE);
}