diff options
2 files changed, 11 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 95ae2c4ad906..2d8b54527cb9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -2489,7 +2489,7 @@ public class NotificationPanelView extends PanelView implements } protected void setVerticalPanelTranslation(float translation) { - mNotificationStackScroller.setTranslationX(translation); + mNotificationStackScroller.setVerticalPanelTranslation(translation); mQsFrame.setTranslationX(translation); int size = mVerticalTranslationListener.size(); for (int i = 0; i < size; i++) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 01ee7f1230af..9d0d295a26ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -422,6 +422,7 @@ public class NotificationStackScrollLayout extends ViewGroup private int mHeadsUpInset; private HeadsUpAppearanceController mHeadsUpAppearanceController; private NotificationIconAreaController mIconAreaController; + private float mVerticalPanelTranslation; public NotificationStackScrollLayout(Context context) { this(context, null); @@ -4003,8 +4004,13 @@ public class NotificationStackScrollLayout extends ViewGroup notifyHeightChangeListener(mShelf); } - private void updateAntiBurnInTranslation() { - setTranslationX(mAntiBurnInOffsetX * mDarkAmount); + private void updatePanelTranslation() { + setTranslationX(mVerticalPanelTranslation + mAntiBurnInOffsetX * mDarkAmount); + } + + public void setVerticalPanelTranslation(float verticalPanelTranslation) { + mVerticalPanelTranslation = verticalPanelTranslation; + updatePanelTranslation(); } /** @@ -4034,7 +4040,7 @@ public class NotificationStackScrollLayout extends ViewGroup } updateAlgorithmHeightAndPadding(); updateBackgroundDimming(); - updateAntiBurnInTranslation(); + updatePanelTranslation(); requestChildrenUpdate(); } @@ -4602,7 +4608,7 @@ public class NotificationStackScrollLayout extends ViewGroup public void setAntiBurnInOffsetX(int antiBurnInOffsetX) { mAntiBurnInOffsetX = antiBurnInOffsetX; - updateAntiBurnInTranslation(); + updatePanelTranslation(); } public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { |