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

Commit 7c60dad0 authored by Ben Lin's avatar Ben Lin
Browse files

Refactor around NSSL to open up some more APIs for subcomponents. 

Bug: 251207888
Test: make GoldfishPcSystemUI
Change-Id: Ie84504e7c4d4f2c48a431ee70f2ad6e5082ba955
parent f4ceebba

packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper; 
import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver;

import com.android.systemui.media.taptotransfer.sender.MediaTttChipControllerSender;

import com.android.systemui.people.PeopleProvider;

import com.android.systemui.statusbar.QsFrameTranslateModule;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.unfold.FoldStateLogger;

import com.android.systemui.unfold.FoldStateLoggingProvider;
@@ -66,6 +67,7 @@ import dagger.Subcomponent; 
@Subcomponent(modules = {

        DefaultComponentBinder.class,

        DependencyProvider.class,

        QsFrameTranslateModule.class,

        SystemUIBinder.class,

        SystemUIModule.class,

        SystemUICoreStartableModule.class,

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import com.android.systemui.smartspace.dagger.SmartspaceModule; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.QsFrameTranslateModule;

import com.android.systemui.statusbar.notification.collection.NotifPipeline;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinder;

import com.android.systemui.statusbar.notification.collection.inflation.NotificationRowBinderImpl;
@@ -133,7 +132,6 @@ import dagger.Provides; 
            PeopleModule.class,

            PluginModule.class,

            PrivacyModule.class,

            QsFrameTranslateModule.class,

            ScreenshotModule.class,

            SensorModule.class,

            MultiUserUtilsModule.class,

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+3 −2
Original line number Diff line number Diff line
@@ -3385,8 +3385,9 @@ public final class NotificationPanelViewController extends PanelViewController { 
    }



    private void updateQsFrameTranslation() {

        mQsFrameTranslateController.translateQsFrame(mQsFrame, mQs, mOverExpansion,

                mQsTranslationForFullShadeTransition);

        mQsFrameTranslateController.translateQsFrame(mQsFrame, mQs,

                mNavigationBarBottomHeight + mAmbientState.getStackTopMargin());



    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/QsFrameTranslateController.java

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ public abstract class QsFrameTranslateController { 
    /**

     * Calculate and translate the QS Frame on the Y-axis.

     */

    public abstract void translateQsFrame(View qsFrame, QS qs, float overExpansion,

            float qsTranslationForFullShadeTransition);

    public abstract void translateQsFrame(View qsFrame, QS qs, int bottomInset);



    /**

     * Calculate the top padding for notifications panel. This could be the supplied

packages/SystemUI/src/com/android/systemui/statusbar/QsFrameTranslateImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import javax.inject.Inject; 


/**

 * Default implementation of QS Translation. This by default does not do much.

 * This class can be subclassed to allow System UI variants the flexibility to change position of

 * the Quick Settings frame.

 */

@SysUISingleton

public class QsFrameTranslateImpl extends QsFrameTranslateController {
@@ -37,8 +39,8 @@ public class QsFrameTranslateImpl extends QsFrameTranslateController { 
    }



    @Override

    public void translateQsFrame(View qsFrame, QS qs, float overExpansion,

            float qsTranslationForFullShadeTransition) {

    public void translateQsFrame(View qsFrame, QS qs, int bottomInset) {

        // Empty implementation by default, meant to be overridden by subclasses.

    }



    @Override