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

Commit 45485c34 authored by Sorin Basca's avatar Sorin Basca
Browse files

Revert "Provide IconProvider in sysui dagger" 

Revert "Provide IconProvider in sysui dagger"

Revert submission 16003788-inject_iconprovider

Reason for revert: Build break as changes were merged in different branches
Reverted Changes:
I0b54e0841:Provide IconProvider in sysui dagger
If4ab0590f:Provide IconProvider in sysui dagger
Ic031d9694:Provide IconProvider in sysui dagger

Bug: 202792775
Change-Id: I99599152204f4634b2e9a1c623d60f8167919fbe
parent 43047d3b

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java

+2 −2
Original line number Diff line number Diff line
@@ -110,9 +110,9 @@ public class SplashscreenContentDrawer { 
    @VisibleForTesting

    final ColorCache mColorCache;



    SplashscreenContentDrawer(Context context, IconProvider iconProvider, TransactionPool pool) {

    SplashscreenContentDrawer(Context context, TransactionPool pool) {

        mContext = context;

        mIconProvider = iconProvider;

        mIconProvider = new IconProvider(context);

        mTransactionPool = pool;



        // Initialize Splashscreen worker thread

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java

+2 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import android.window.TaskSnapshot; 


import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.TransactionPool;

import com.android.wm.shell.common.annotations.ShellSplashscreenThread;
@@ -124,11 +123,11 @@ public class StartingSurfaceDrawer { 
     * @param splashScreenExecutor The thread used to control add and remove starting window.

     */

    public StartingSurfaceDrawer(Context context, ShellExecutor splashScreenExecutor,

            IconProvider iconProvider, TransactionPool pool) {

            TransactionPool pool) {

        mContext = context;

        mDisplayManager = mContext.getSystemService(DisplayManager.class);

        mSplashScreenExecutor = splashScreenExecutor;

        mSplashscreenContentDrawer = new SplashscreenContentDrawer(mContext, iconProvider, pool);

        mSplashscreenContentDrawer = new SplashscreenContentDrawer(mContext, pool);

        mSplashScreenExecutor.execute(() -> mChoreographer = Choreographer.getInstance());

        mWindowManagerGlobal = WindowManagerGlobal.getInstance();

        mDisplayManager.getDisplay(DEFAULT_DISPLAY);

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingWindowController.java

+2 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import androidx.annotation.BinderThread; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.function.TriConsumer;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.common.RemoteCallable;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.TransactionPool;
@@ -86,11 +85,9 @@ public class StartingWindowController implements RemoteCallable<StartingWindowCo 
    private final SparseIntArray mTaskBackgroundColors = new SparseIntArray();



    public StartingWindowController(Context context, ShellExecutor splashScreenExecutor,

            StartingWindowTypeAlgorithm startingWindowTypeAlgorithm, IconProvider iconProvider,

            TransactionPool pool) {

            StartingWindowTypeAlgorithm startingWindowTypeAlgorithm, TransactionPool pool) {

        mContext = context;

        mStartingSurfaceDrawer = new StartingSurfaceDrawer(context, splashScreenExecutor,

                iconProvider, pool);

        mStartingSurfaceDrawer = new StartingSurfaceDrawer(context, splashScreenExecutor, pool);

        mStartingWindowTypeAlgorithm = startingWindowTypeAlgorithm;

        mSplashScreenExecutor = splashScreenExecutor;

    }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawerTests.java

+3 −7
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.common.HandlerExecutor;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.TransactionPool;
@@ -94,8 +93,6 @@ public class StartingSurfaceDrawerTests { 
    @Mock

    private WindowManager mMockWindowManager;

    @Mock

    private IconProvider mIconProvider;

    @Mock

    private TransactionPool mTransactionPool;



    private final Handler mTestHandler = new Handler(Looper.getMainLooper());
@@ -108,8 +105,8 @@ public class StartingSurfaceDrawerTests { 
        int mAddWindowForTask = 0;



        TestStartingSurfaceDrawer(Context context, ShellExecutor splashScreenExecutor,

                IconProvider iconProvider, TransactionPool pool) {

            super(context, splashScreenExecutor, iconProvider, pool);

                TransactionPool pool) {

            super(context, splashScreenExecutor, pool);

        }



        @Override
@@ -159,8 +156,7 @@ public class StartingSurfaceDrawerTests { 
        doNothing().when(mMockWindowManager).addView(any(), any());

        mTestExecutor = new HandlerExecutor(mTestHandler);

        mStartingSurfaceDrawer = spy(

                new TestStartingSurfaceDrawer(mTestContext, mTestExecutor, mIconProvider,

                        mTransactionPool));

                new TestStartingSurfaceDrawer(mTestContext, mTestExecutor, mTransactionPool));

    }



    @Test

packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java

+2 −10
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.view.WindowManager; 


import com.android.internal.logging.UiEventLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.launcher3.icons.IconProvider;

import com.android.systemui.dagger.WMComponent;

import com.android.systemui.dagger.WMSingleton;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;
@@ -162,12 +161,6 @@ public abstract class WMShellBaseModule { 
        return new SystemWindows(displayController, wmService);

    }



    @WMSingleton

    @Provides

    static IconProvider provideIconProvider(Context context) {

        return new IconProvider(context);

    }



    // We currently dedupe multiple messages, so we use the shell main handler directly

    @WMSingleton

    @Provides
@@ -455,10 +448,9 @@ public abstract class WMShellBaseModule { 
    @Provides

    static StartingWindowController provideStartingWindowController(Context context,

            @ShellSplashscreenThread ShellExecutor splashScreenExecutor,

            StartingWindowTypeAlgorithm startingWindowTypeAlgorithm, IconProvider iconProvider,

            TransactionPool pool) {

            StartingWindowTypeAlgorithm startingWindowTypeAlgorithm, TransactionPool pool) {

        return new StartingWindowController(context, splashScreenExecutor,

                startingWindowTypeAlgorithm, iconProvider, pool);

                startingWindowTypeAlgorithm, pool);

    }



    //