Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ce27d3 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents 9c6d9753 be8f3574

packages/SystemUI/res/values-sw720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+12 −5
Original line number Diff line number Diff line
@@ -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);

        }