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

Commit 8decff09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Attach the background-panel to DisplayContent.""

parents 24697854 d9fa514f

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.internal.jank.InteractionJankMonitor; 
import com.android.internal.logging.UiEventLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.RootDisplayAreaOrganizer;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.TaskViewTransitions;
@@ -272,12 +271,11 @@ public abstract class WMShellModule { 
            TaskStackListenerImpl taskStackListener,

            UiEventLogger uiEventLogger,

            InteractionJankMonitor jankMonitor,

            RootDisplayAreaOrganizer rootDisplayAreaOrganizer,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler) {

        return OneHandedController.create(context, shellInit, shellCommandHandler, shellController,

                windowManager, displayController, displayLayout, taskStackListener, jankMonitor,

                uiEventLogger, rootDisplayAreaOrganizer, mainExecutor, mainHandler);

                uiEventLogger, mainExecutor, mainHandler);

    }



    //

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/BackgroundWindowManager.java

+1 −7
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.graphics.Rect; 
import android.os.Binder;

import android.util.Slog;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.IWindow;

import android.view.LayoutInflater;

import android.view.SurfaceControl;
@@ -48,7 +47,6 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.wm.shell.R;

import com.android.wm.shell.RootDisplayAreaOrganizer;

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



import java.io.PrintWriter;
@@ -69,14 +67,11 @@ public final class BackgroundWindowManager extends WindowlessWindowManager { 
    private SurfaceControl mLeash;

    private View mBackgroundView;

    private @OneHandedState.State int mCurrentState;

    private RootDisplayAreaOrganizer mRootDisplayAreaOrganizer;



    public BackgroundWindowManager(Context context,

            RootDisplayAreaOrganizer rootDisplayAreaOrganizer) {

    public BackgroundWindowManager(Context context) {

        super(context.getResources().getConfiguration(), null /* rootSurface */,

                null /* hostInputToken */);

        mContext = context;

        mRootDisplayAreaOrganizer = rootDisplayAreaOrganizer;

        mTransactionFactory = SurfaceControl.Transaction::new;

    }
@@ -117,7 +112,6 @@ public final class BackgroundWindowManager extends WindowlessWindowManager { 
                .setOpaque(true)

                .setName(TAG)

                .setCallsite("BackgroundWindowManager#attachToParentSurface");

        mRootDisplayAreaOrganizer.attachToDisplayArea(Display.DEFAULT_DISPLAY, builder);

        mLeash = builder.build();

        b.setParent(mLeash);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+1 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import androidx.annotation.VisibleForTesting; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.UiEventLogger;

import com.android.wm.shell.R;

import com.android.wm.shell.RootDisplayAreaOrganizer;

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

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

import com.android.wm.shell.common.DisplayLayout;
@@ -205,14 +204,12 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, 
            DisplayController displayController, DisplayLayout displayLayout,

            TaskStackListenerImpl taskStackListener,

            InteractionJankMonitor jankMonitor, UiEventLogger uiEventLogger,

            RootDisplayAreaOrganizer rootDisplayAreaOrganizer,

            ShellExecutor mainExecutor, Handler mainHandler) {

        OneHandedSettingsUtil settingsUtil = new OneHandedSettingsUtil();

        OneHandedAccessibilityUtil accessibilityUtil = new OneHandedAccessibilityUtil(context);

        OneHandedTimeoutHandler timeoutHandler = new OneHandedTimeoutHandler(mainExecutor);

        OneHandedState oneHandedState = new OneHandedState();

        BackgroundWindowManager backgroundWindowManager =

                new BackgroundWindowManager(context, rootDisplayAreaOrganizer);

        BackgroundWindowManager backgroundWindowManager = new BackgroundWindowManager(context);

        OneHandedTutorialHandler tutorialHandler = new OneHandedTutorialHandler(context,

                settingsUtil, windowManager, backgroundWindowManager);

        OneHandedAnimationController animationController =

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/BackgroundWindowManagerTest.java

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.test.annotation.UiThreadTest; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.wm.shell.RootDisplayAreaOrganizer;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.common.DisplayLayout;
@@ -42,13 +41,11 @@ public class BackgroundWindowManagerTest extends ShellTestCase { 
    private BackgroundWindowManager mBackgroundWindowManager;

    @Mock

    private DisplayLayout  mMockDisplayLayout;

    @Mock

    private RootDisplayAreaOrganizer mRootDisplayAreaOrganizer;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mBackgroundWindowManager = new BackgroundWindowManager(mContext, mRootDisplayAreaOrganizer);

        mBackgroundWindowManager = new BackgroundWindowManager(mContext);

        mBackgroundWindowManager.onDisplayChanged(mMockDisplayLayout);

    }