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

Commit 090aa852 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix qs translation on split shade lock screen" into sc-v2-dev am: b90a1742 am: 4383dbd8 

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

Change-Id: Ic0cbf9121f09a42a4700e4a061c4484b42e9a790
parents ce577e1d 4383dbd8

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2522,7 +2522,7 @@ public class NotificationPanelViewController extends PanelViewController { 
                    // qsTranslation should only be positive during pulse expansion because it's

                    // qsTranslation should only be positive during pulse expansion because it's

                    // already translating in from the top

                    // already translating in from the top

                    qsTranslation = Math.max(0, (top - mQs.getHeader().getHeight()) / 2.0f);

                    qsTranslation = Math.max(0, (top - mQs.getHeader().getHeight()) / 2.0f);

                } else {

                } else if (!mShouldUseSplitNotificationShade) {

                    qsTranslation = (top - mQs.getHeader().getHeight()) * QS_PARALLAX_AMOUNT;

                    qsTranslation = (top - mQs.getHeader().getHeight()) * QS_PARALLAX_AMOUNT;

                }

                }

            }

            }