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

Commit 0de2b112 authored by Yifei Zhang's avatar Yifei Zhang
Browse files

unfold: move everything into SysUIUnfoldComponent 

- Pure mechanical refactor

Flag: NA
Test: build & boot
Bug: 308693650
Change-Id: Id8188dc123377f8c5833e753d885688547842e9e
parent 05a9407c

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

+8 −48
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import com.android.systemui.unfold.FoldStateLogger; 
import com.android.systemui.unfold.FoldStateLoggingProvider;

import com.android.systemui.unfold.SysUIUnfoldComponent;

import com.android.systemui.unfold.UnfoldTransitionProgressProvider;

import com.android.systemui.unfold.dagger.UnfoldBg;

import com.android.systemui.unfold.progress.UnfoldTransitionProgressForwarder;

import com.android.wm.shell.back.BackAnimation;

import com.android.wm.shell.bubbles.Bubbles;

import com.android.wm.shell.desktopmode.DesktopMode;
@@ -139,26 +137,19 @@ public interface SysUIComponent { 
                            c.getUnfoldHapticsPlayer();

                            c.getNaturalRotationUnfoldProgressProvider().init();

                            c.getUnfoldLatencyTracker().init();

                            c.getFoldStateLoggingProvider()

                                    .ifPresent(FoldStateLoggingProvider::init);

                            c.getFoldStateLogger().ifPresent(FoldStateLogger::init);

                            final UnfoldTransitionProgressProvider progressProvider =

                                    Flags.unfoldAnimationBackgroundProgress()

                                            ? c.getBgUnfoldTransitionProgressProvider()

                                            : c.getUnfoldTransitionProgressProvider();

                            progressProvider.addCallback(c.getUnfoldTransitionProgressForwarder());

                        });

        // No init method needed, just needs to be gotten so that it's created.

        getMediaMuteAwaitConnectionCli();

        getNearbyMediaDevicesManager();

        getConnectingDisplayViewModel().init();

        getFoldStateLoggingProvider().ifPresent(FoldStateLoggingProvider::init);

        getFoldStateLogger().ifPresent(FoldStateLogger::init);



        Optional<UnfoldTransitionProgressProvider> unfoldTransitionProgressProvider;



        if (Flags.unfoldAnimationBackgroundProgress()) {

            unfoldTransitionProgressProvider = getBgUnfoldTransitionProgressProvider();

        } else {

            unfoldTransitionProgressProvider = getUnfoldTransitionProgressProvider();

        }

        unfoldTransitionProgressProvider

                .ifPresent(

                        (progressProvider) ->

                                getUnfoldTransitionProgressForwarder()

                                        .ifPresent(progressProvider::addCallback));

    }



    /**
@@ -179,37 +170,6 @@ public interface SysUIComponent { 
    @SysUISingleton

    ContextComponentHelper getContextComponentHelper();



    /**

     * Creates a UnfoldTransitionProgressProvider that calculates progress in the background.

     */

    @SysUISingleton

    @UnfoldBg

    Optional<UnfoldTransitionProgressProvider> getBgUnfoldTransitionProgressProvider();



    /**

     * Creates a UnfoldTransitionProgressProvider that calculates progress in the main thread.

     */

    @SysUISingleton

    Optional<UnfoldTransitionProgressProvider> getUnfoldTransitionProgressProvider();



    /**

     * Creates a UnfoldTransitionProgressForwarder.

     */

    @SysUISingleton

    Optional<UnfoldTransitionProgressForwarder> getUnfoldTransitionProgressForwarder();



    /**

     * Creates a FoldStateLoggingProvider.

     */

    @SysUISingleton

    Optional<FoldStateLoggingProvider> getFoldStateLoggingProvider();



    /**

     * Creates a FoldStateLogger.

     */

    @SysUISingleton

    Optional<FoldStateLogger> getFoldStateLogger();



    /**

     * Main dependency providing module.

     */

packages/SystemUI/src/com/android/systemui/unfold/SysUIUnfoldModule.kt

+17 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.shade.NotificationPanelUnfoldAnimationController

import com.android.systemui.statusbar.phone.StatusBarMoveFromCenterAnimationController

import com.android.systemui.unfold.dagger.UnfoldBg

import com.android.systemui.unfold.progress.UnfoldTransitionProgressForwarder

import com.android.systemui.unfold.util.NaturalRotationUnfoldProgressProvider

import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider

import com.android.systemui.unfold.util.UnfoldKeyguardVisibilityManager
@@ -106,4 +107,20 @@ interface SysUIUnfoldComponent { 
    fun getUnfoldLatencyTracker(): UnfoldLatencyTracker



    fun getNaturalRotationUnfoldProgressProvider(): NaturalRotationUnfoldProgressProvider



    /** Creates a UnfoldTransitionProgressProvider that calculates progress in the main thread. */

    fun getUnfoldTransitionProgressProvider(): UnfoldTransitionProgressProvider



    /** Creates a UnfoldTransitionProgressProvider that calculates progress in the background. */

    @UnfoldBg

    fun getBgUnfoldTransitionProgressProvider(): UnfoldTransitionProgressProvider



    /** Creates a UnfoldTransitionProgressForwarder. */

    fun getUnfoldTransitionProgressForwarder(): UnfoldTransitionProgressForwarder



    /** Creates a FoldStateLoggingProvider. */

    fun getFoldStateLoggingProvider(): Optional<FoldStateLoggingProvider>



    /** Creates a FoldStateLogger. */

    fun getFoldStateLogger(): Optional<FoldStateLogger>

}