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

Commit e0f9cd0f authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

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

Merge "Refactor around NSSL to open up some more APIs for subcomponents." into tm-qpr-dev am: 49adca7c

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



Change-Id: Iaf28f64ace4751a1b5d28a7bdb28bb9fead85c65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e186f6d9 49adca7c

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.keyguard.KeyguardSliceProvider; 
import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionCli;

import com.android.systemui.media.nearby.NearbyMediaDevicesManager;

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;
@@ -63,6 +64,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
@@ -3383,8 +3383,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