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

Merge "Simplifying mVerticalTranslationListener" into sc-dev am: 700621b509

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8dd220853d750dbd566b2d1c961c7cdcd82da31
This commit is contained in:
Michał Brzeziński
2021-02-22 13:05:32 +00:00
committed by Automerger Merge Worker
parent e3f9510f38 700621b509
commit ed94f2e0a7
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceController.java
View File

@@ -134,7 +134,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener,
mStackScrollerController = stackScrollerController; mStackScrollerController = stackScrollerController;
mNotificationPanelViewController = notificationPanelViewController; mNotificationPanelViewController = notificationPanelViewController;
notificationPanelViewController.addTrackingHeadsUpListener(mSetTrackingHeadsUp); notificationPanelViewController.addTrackingHeadsUpListener(mSetTrackingHeadsUp);
notificationPanelViewController.addVerticalTranslationListener(mUpdatePanelTranslation); notificationPanelViewController.setVerticalTranslationListener(mUpdatePanelTranslation);
notificationPanelViewController.setHeadsUpAppearanceController(this); notificationPanelViewController.setHeadsUpAppearanceController(this);
mStackScrollerController.addOnExpandedHeightChangedListener(mSetExpandedHeight); mStackScrollerController.addOnExpandedHeightChangedListener(mSetExpandedHeight);
mStackScrollerController.addOnLayoutChangeListener(mStackScrollLayoutChangeListener); mStackScrollerController.addOnLayoutChangeListener(mStackScrollLayoutChangeListener);
@@ -171,7 +171,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener,
mHeadsUpStatusBarView.setOnDrawingRectChangedListener(null); mHeadsUpStatusBarView.setOnDrawingRectChangedListener(null);
mWakeUpCoordinator.removeListener(this); mWakeUpCoordinator.removeListener(this);
mNotificationPanelViewController.removeTrackingHeadsUpListener(mSetTrackingHeadsUp); mNotificationPanelViewController.removeTrackingHeadsUpListener(mSetTrackingHeadsUp);
mNotificationPanelViewController.removeVerticalTranslationListener(mUpdatePanelTranslation); mNotificationPanelViewController.setVerticalTranslationListener(null);
mNotificationPanelViewController.setHeadsUpAppearanceController(null); mNotificationPanelViewController.setHeadsUpAppearanceController(null);
mStackScrollerController.removeOnExpandedHeightChangedListener(mSetExpandedHeight); mStackScrollerController.removeOnExpandedHeightChangedListener(mSetExpandedHeight);
mStackScrollerController.removeOnLayoutChangeListener(mStackScrollLayoutChangeListener); mStackScrollerController.removeOnLayoutChangeListener(mStackScrollLayoutChangeListener);

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

@@ -474,7 +474,7 @@ public class NotificationPanelViewController extends PanelViewController {
private ArrayList<Consumer<ExpandableNotificationRow>> private ArrayList<Consumer<ExpandableNotificationRow>>
mTrackingHeadsUpListeners = mTrackingHeadsUpListeners =
new ArrayList<>(); new ArrayList<>();
private ArrayList<Runnable> mVerticalTranslationListener = new ArrayList<>(); private Runnable mVerticalTranslationListener;
private HeadsUpAppearanceController mHeadsUpAppearanceController; private HeadsUpAppearanceController mHeadsUpAppearanceController;
private int mPanelAlpha; private int mPanelAlpha;
@@ -2954,9 +2954,8 @@ public class NotificationPanelViewController extends PanelViewController {
protected void setHorizontalPanelTranslation(float translation) { protected void setHorizontalPanelTranslation(float translation) {
mNotificationStackScrollLayoutController.setTranslationX(translation); mNotificationStackScrollLayoutController.setTranslationX(translation);
mQsFrame.setTranslationX(translation); mQsFrame.setTranslationX(translation);
int size = mVerticalTranslationListener.size(); if (mVerticalTranslationListener != null) {
for (int i = 0; i < size; i++) { mVerticalTranslationListener.run();
mVerticalTranslationListener.get(i).run();
} }
} }
@@ -3249,12 +3248,8 @@ public class NotificationPanelViewController extends PanelViewController {
mTrackingHeadsUpListeners.remove(listener); mTrackingHeadsUpListeners.remove(listener);
} }
public void addVerticalTranslationListener(Runnable verticalTranslationListener) { public void setVerticalTranslationListener(Runnable verticalTranslationListener) {
mVerticalTranslationListener.add(verticalTranslationListener); mVerticalTranslationListener = verticalTranslationListener;
}
public void removeVerticalTranslationListener(Runnable verticalTranslationListener) {
mVerticalTranslationListener.remove(verticalTranslationListener);
} }
public void setHeadsUpAppearanceController( public void setHeadsUpAppearanceController(

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.statusbar.phone; package com.android.systemui.statusbar.phone;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -197,9 +198,9 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase {
mHeadsUpAppearanceController.destroy(); mHeadsUpAppearanceController.destroy();
verify(mHeadsUpManager).removeListener(any()); verify(mHeadsUpManager).removeListener(any());
verify(mDarkIconDispatcher).removeDarkReceiver((DarkIconDispatcher.DarkReceiver) any()); verify(mDarkIconDispatcher).removeDarkReceiver((DarkIconDispatcher.DarkReceiver) any());
verify(mPanelView).removeVerticalTranslationListener(any()); verify(mPanelView).setVerticalTranslationListener(isNull());
verify(mPanelView).removeTrackingHeadsUpListener(any()); verify(mPanelView).removeTrackingHeadsUpListener(any());
verify(mPanelView).setHeadsUpAppearanceController(any()); verify(mPanelView).setHeadsUpAppearanceController(isNull());
verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any()); verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any());
verify(mStackScrollerController).removeOnLayoutChangeListener(any()); verify(mStackScrollerController).removeOnLayoutChangeListener(any());
} }