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

Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev

Browse Source 
am: 43999195e9

Change-Id: I430343e75be34e70b8e4ff3c4f08b73c1ae7b103
This commit is contained in:
Selim Cinek
2018-06-21 13:55:41 -07:00
committed by android-build-merger
parent 3850aff60e 43999195e9
commit d3a10f5bfd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
View File

@@ -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++) {

14
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -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) {