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

Commit fcdb25c5 authored by Yining Liu's avatar Yining Liu Committed by Automerger Merge Worker
Browse files

Merge "Correct comments in StackScrollAlgorithm" into tm-qpr-dev am: b6128c6b am: df93ebe8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21423564



Change-Id: I2adf2cc6385d0201874dd11d7943248fc841477e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9272c48 df93ebe8

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/StackScrollAlgorithm.java

+6 −9
Original line number Diff line number Diff line
@@ -894,20 +894,19 @@ public class StackScrollAlgorithm { 
        ExpandableViewState childViewState = child.getViewState();

        float baseZ = ambientState.getBaseZHeight();



        // Handles HUN shadow when Shade is opened



        if (child.mustStayOnScreen() && !childViewState.headsUpIsVisible

                && !ambientState.isDozingAndNotPulsing(child)

                && childViewState.getYTranslation() < ambientState.getTopPadding()

                + ambientState.getStackTranslation()) {

            // Handles HUN shadow when Shade is opened, and AmbientState.mScrollY > 0

            // Calculate the HUN's z-value based on its overlapping fraction with QQS Panel.

            // When scrolling down shade to make HUN back to in-position in Notification Panel,

            // The over-lapping fraction goes to 0, and shadows hides gradually.



            if (childrenOnTop != 0.0f) {

                // To elevate the later HUN over previous HUN

                // To elevate the later HUN over previous HUN when multiple HUNs exist

                childrenOnTop++;

            } else {

                // Handles HUN shadow when Shade is opened, and AmbientState.mScrollY > 0

                // Calculate the HUN's z-value based on its overlapping fraction with QQS Panel.

                // When scrolling down shade to make HUN back to in-position in Notification Panel,

                // The overlapping fraction goes to 0, and shadows hides gradually.

                float overlap = ambientState.getTopPadding()

                        + ambientState.getStackTranslation() - childViewState.getYTranslation();

                // To prevent over-shadow during HUN entry
@@ -915,7 +914,6 @@ public class StackScrollAlgorithm { 
                        1.0f,

                        overlap / childViewState.height

                );

                MathUtils.saturate(childrenOnTop);

            }

            childViewState.setZTranslation(baseZ

                    + childrenOnTop * mPinnedZTranslationExtra);
@@ -945,7 +943,6 @@ public class StackScrollAlgorithm { 
            childViewState.setZTranslation(baseZ);

        }



        // Handles HUN shadow when shade is closed.

        // While HUN is showing and Shade is closed: headerVisibleAmount stays 0, shadow stays.

        // During HUN-to-Shade (eg. dragging down HUN to open Shade): headerVisibleAmount goes

        // gradually from 0 to 1, shadow hides gradually.