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

Commit bb6f6e5d authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by kholoud mohamed
Browse files

Revert "Renaming TaskbarController to LauncherTaskbarUIController" 

This reverts commit 40a74216.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I13700009003387451&testResultId=TR89423459137251402, bug https://buganizer.corp.google.com/issues/188755902

Bug: 188755902
Change-Id: Icd1ddd43e62d392f6b68b0150a1075f73106391a
parent 34f90233

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+10 −10
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import com.android.launcher3.proxy.StartActivityParams; 
import com.android.launcher3.statehandlers.BackButtonAlphaHandler;

import com.android.launcher3.statehandlers.DepthController;

import com.android.launcher3.statemanager.StateManager.StateHandler;

import com.android.launcher3.taskbar.LauncherTaskbarUIController;

import com.android.launcher3.taskbar.TaskbarController;

import com.android.launcher3.taskbar.TaskbarManager;

import com.android.launcher3.taskbar.TaskbarStateHandler;

import com.android.launcher3.uioverrides.RecentsViewStateController;
@@ -96,7 +96,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
    private OverviewActionsView mActionsView;



    private @Nullable TaskbarManager mTaskbarManager;

    private @Nullable LauncherTaskbarUIController mTaskbarUIController;

    private @Nullable TaskbarController mTaskbarController;

    private final ServiceConnection mTisBinderConnection = new ServiceConnection() {

        @Override

        public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
@@ -261,8 +261,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 


    }



    public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) {

        mTaskbarUIController = taskbarUIController;

    public void setTaskbarController(TaskbarController taskbarController) {

        mTaskbarController = taskbarController;

    }



    public <T extends OverviewActionsView> T getActionsView() {
@@ -292,8 +292,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 
        return mDepthController;

    }



    public @Nullable LauncherTaskbarUIController getTaskbarUIController() {

        return mTaskbarUIController;

    public @Nullable TaskbarController getTaskbarController() {

        return mTaskbarController;

    }



    public TaskbarStateHandler getTaskbarStateHandler() {
@@ -349,8 +349,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 


    @Override

    public float getNormalTaskbarScale() {

        if (mTaskbarUIController != null) {

            return mTaskbarUIController.getTaskbarScaleOnHome();

        if (mTaskbarController != null) {

            return mTaskbarController.getTaskbarScaleOnHome();

        }

        return super.getNormalTaskbarScale();

    }
@@ -372,8 +372,8 @@ public abstract class BaseQuickstepLauncher extends Launcher 
        }



        if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {

            if (mTaskbarUIController != null) {

                mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed());

            if (mTaskbarController != null) {

                mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());

            }

        }

quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+2 −2
Original line number Diff line number Diff line
@@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener, 
            removeOutlineDrawings();

        }



        if (mLauncher.getTaskbarUIController() != null) {

            mLauncher.getTaskbarUIController().onHotseatUpdated();

        if (mLauncher.getTaskbarController() != null) {

            mLauncher.getTaskbarController().onHotseatUpdated();

        }

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.animation.Animator; 


import com.android.launcher3.BaseQuickstepLauncher;

import com.android.launcher3.Utilities;

import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks;

import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;

import com.android.quickstep.AnimatedFloat;

import com.android.quickstep.SystemUiProxy;

import com.android.systemui.shared.system.QuickStepContract;

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java→quickstep/src/com/android/launcher3/taskbar/TaskbarController.java

+4 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig; 
 * TODO: Rename to have Launcher prefix

 */



public class LauncherTaskbarUIController extends TaskbarUIController {

public class TaskbarController extends TaskbarUIController {



    private final BaseQuickstepLauncher mLauncher;

    private final TaskbarStateHandler mTaskbarStateHandler;
@@ -52,8 +52,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
    private @Nullable Animator mAnimator;

    private boolean mIsAnimatingToLauncher;



    public LauncherTaskbarUIController(

            BaseQuickstepLauncher launcher, TaskbarActivityContext context) {

    public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {

        mContext = context;

        mTaskbarContainerView = context.getDragLayer();

        mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
@@ -73,7 +72,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        mHotseatController.init();

        setTaskbarViewVisible(!mLauncher.hasBeenResumed());

        alignRealHotseatWithTaskbar();

        mLauncher.setTaskbarUIController(this);

        mLauncher.setTaskbarController(this);

    }



    @Override
@@ -87,7 +86,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        mHotseatController.cleanup();

        setTaskbarViewVisible(true);

        mLauncher.getHotseat().setIconsAlpha(1f);

        mLauncher.setTaskbarUIController(null);

        mLauncher.setTaskbarController(null);

    }



    @Override

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
        if (mTaskbarActivityContext != null) {

            mTaskbarActivityContext.setUIController(mLauncher == null

                    ? TaskbarUIController.DEFAULT

                    : new LauncherTaskbarUIController(launcher, mTaskbarActivityContext));

                    : new TaskbarController(launcher, mTaskbarActivityContext));

        }

    }
@@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
        mTaskbarActivityContext.init();

        if (mLauncher != null) {

            mTaskbarActivityContext.setUIController(

                    new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext));

                    new TaskbarController(mLauncher, mTaskbarActivityContext));

        }

    }