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

Commit e6937a54 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic13adef1c36856058d1f51ac8535fd6484c497ba
parents 93f97a19 700621b5

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

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mStackScrollerController = stackScrollerController;

        mNotificationPanelViewController = notificationPanelViewController;

        notificationPanelViewController.addTrackingHeadsUpListener(mSetTrackingHeadsUp);

        notificationPanelViewController.addVerticalTranslationListener(mUpdatePanelTranslation);

        notificationPanelViewController.setVerticalTranslationListener(mUpdatePanelTranslation);

        notificationPanelViewController.setHeadsUpAppearanceController(this);

        mStackScrollerController.addOnExpandedHeightChangedListener(mSetExpandedHeight);

        mStackScrollerController.addOnLayoutChangeListener(mStackScrollLayoutChangeListener);
@@ -171,7 +171,7 @@ public class HeadsUpAppearanceController implements OnHeadsUpChangedListener, 
        mHeadsUpStatusBarView.setOnDrawingRectChangedListener(null);

        mWakeUpCoordinator.removeListener(this);

        mNotificationPanelViewController.removeTrackingHeadsUpListener(mSetTrackingHeadsUp);

        mNotificationPanelViewController.removeVerticalTranslationListener(mUpdatePanelTranslation);

        mNotificationPanelViewController.setVerticalTranslationListener(null);

        mNotificationPanelViewController.setHeadsUpAppearanceController(null);

        mStackScrollerController.removeOnExpandedHeightChangedListener(mSetExpandedHeight);

        mStackScrollerController.removeOnLayoutChangeListener(mStackScrollLayoutChangeListener);

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

+5 −10
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ public class NotificationPanelViewController extends PanelViewController { 
    private ArrayList<Consumer<ExpandableNotificationRow>>

            mTrackingHeadsUpListeners =

            new ArrayList<>();

    private ArrayList<Runnable> mVerticalTranslationListener = new ArrayList<>();

    private Runnable mVerticalTranslationListener;

    private HeadsUpAppearanceController mHeadsUpAppearanceController;



    private int mPanelAlpha;
@@ -2954,9 +2954,8 @@ public class NotificationPanelViewController extends PanelViewController { 
    protected void setHorizontalPanelTranslation(float translation) {

        mNotificationStackScrollLayoutController.setTranslationX(translation);

        mQsFrame.setTranslationX(translation);

        int size = mVerticalTranslationListener.size();

        for (int i = 0; i < size; i++) {

            mVerticalTranslationListener.get(i).run();

        if (mVerticalTranslationListener != null) {

            mVerticalTranslationListener.run();

        }

    }
@@ -3249,12 +3248,8 @@ public class NotificationPanelViewController extends PanelViewController { 
        mTrackingHeadsUpListeners.remove(listener);

    }



    public void addVerticalTranslationListener(Runnable verticalTranslationListener) {

        mVerticalTranslationListener.add(verticalTranslationListener);

    }



    public void removeVerticalTranslationListener(Runnable verticalTranslationListener) {

        mVerticalTranslationListener.remove(verticalTranslationListener);

    public void setVerticalTranslationListener(Runnable verticalTranslationListener) {

        mVerticalTranslationListener = verticalTranslationListener;

    }



    public void setHeadsUpAppearanceController(

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

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.phone;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.isNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.verify;
@@ -197,9 +198,9 @@ public class HeadsUpAppearanceControllerTest extends SysuiTestCase { 
        mHeadsUpAppearanceController.destroy();

        verify(mHeadsUpManager).removeListener(any());

        verify(mDarkIconDispatcher).removeDarkReceiver((DarkIconDispatcher.DarkReceiver) any());

        verify(mPanelView).removeVerticalTranslationListener(any());

        verify(mPanelView).setVerticalTranslationListener(isNull());

        verify(mPanelView).removeTrackingHeadsUpListener(any());

        verify(mPanelView).setHeadsUpAppearanceController(any());

        verify(mPanelView).setHeadsUpAppearanceController(isNull());

        verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any());

        verify(mStackScrollerController).removeOnLayoutChangeListener(any());

    }