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

Commit e19dfc93 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove Dep.get(CommandQueue.class) from NavBarView"" into tm-dev am: 17cea840 

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



Change-Id: I2106edb008ebe523e5ce86af9c6052385b56b9de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 681369e2 17cea840

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+9 −12
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    private final Optional<Pip> mPipOptional;

    private final Optional<Recents> mRecentsOptional;

    private final DeviceConfigProxy mDeviceConfigProxy;

    private final NavigationBarTransitions mNavigationBarTransitions;

    private final Optional<BackAnimation> mBackAnimation;

    private final Handler mHandler;

    private final NavigationBarOverlayController mNavbarOverlayController;
@@ -514,7 +513,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
            InputMethodManager inputMethodManager,

            DeadZone deadZone,

            DeviceConfigProxy deviceConfigProxy,

            NavigationBarTransitions navigationBarTransitions,

            Optional<BackAnimation> backAnimation) {

        super(navigationBarView);

        mFrame = navigationBarFrame;
@@ -539,7 +537,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        mRecentsOptional = recentsOptional;

        mDeadZone = deadZone;

        mDeviceConfigProxy = deviceConfigProxy;

        mNavigationBarTransitions = navigationBarTransitions;

        mBackAnimation = backAnimation;

        mHandler = mainHandler;

        mNavbarOverlayController = navbarOverlayController;
@@ -564,7 +561,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    public void onInit() {

        // TODO: A great deal of this code should probably live in onViewAttached.

        // It should also has corresponding cleanup in onViewDetached.

        mView.setBarTransitions(mNavigationBarTransitions);

        mView.setTouchHandler(mTouchHandler);

        mView.setNavBarMode(mNavBarMode);

        mView.updateRotationButton();
@@ -636,7 +632,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        mView.setOnVerticalChangedListener(this::onVerticalChanged);

        mView.setOnTouchListener(this::onNavigationTouch);

        if (mSavedState != null) {

            getBarTransitions().getLightTransitionsController().restoreState(mSavedState);

            mView.getLightTransitionsController().restoreState(mSavedState);

        }

        setNavigationIconHints(mNavigationIconHints);

        mView.setWindowVisible(isNavBarWindowVisible());
@@ -709,7 +705,8 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
                mView.getRotationButtonController();

        rotationButtonController.setRotationCallback(null);

        mView.setUpdateActiveTouchRegionsCallback(null);

        getBarTransitions().destroy();

        mView.getBarTransitions().destroy();

        mView.getLightTransitionsController().destroy(mContext);

        mOverviewProxyService.removeCallback(mOverviewProxyListener);

        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

        if (mOrientationHandle != null) {
@@ -735,7 +732,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        outState.putInt(EXTRA_APPEARANCE, mAppearance);

        outState.putInt(EXTRA_BEHAVIOR, mBehavior);

        outState.putBoolean(EXTRA_TRANSIENT_STATE, mTransientShown);

        getBarTransitions().getLightTransitionsController().saveState(outState);

        mView.getLightTransitionsController().saveState(outState);

    }



    /**
@@ -896,7 +893,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        pw.println("  mTransientShown=" + mTransientShown);

        pw.println("  mTransientShownFromGestureOnSystemBar="

                + mTransientShownFromGestureOnSystemBar);

        dumpBarTransitions(pw, "mNavigationBarView", getBarTransitions());

        dumpBarTransitions(pw, "mNavigationBarView", mView.getBarTransitions());

        mView.dump(pw);

    }
@@ -1433,7 +1430,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        mLightBarController = lightBarController;

        if (mLightBarController != null) {

            mLightBarController.setNavigationBar(

                    getBarTransitions().getLightTransitionsController());

                    mView.getLightTransitionsController());

        }

    }
@@ -1475,7 +1472,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
                mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive)

                        .orElse(false)

                && mNavigationBarWindowState != WINDOW_STATE_HIDDEN;

        getBarTransitions().transitionTo(mTransitionMode, anim);

        mView.getBarTransitions().transitionTo(mTransitionMode, anim);

    }



    public void disableAnimationsDuringHide(long delay) {
@@ -1495,11 +1492,11 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    }



    public NavigationBarTransitions getBarTransitions() {

        return mNavigationBarTransitions;

        return mView.getBarTransitions();

    }



    public void finishBarAnimations() {

        getBarTransitions().finishAnimations();

        mView.getBarTransitions().finishAnimations();

    }



    private WindowManager.LayoutParams getBarLayoutParams(int rotation) {

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java

+10 −11
Original line number Diff line number Diff line
@@ -31,19 +31,17 @@ import android.view.View; 


import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope;

import com.android.systemui.navigationbar.buttons.ButtonDispatcher;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.phone.BarTransitions;

import com.android.systemui.statusbar.phone.LightBarTransitionsController;

import com.android.systemui.statusbar.policy.KeyguardStateController;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;



import javax.inject.Inject;



/** */

@NavigationBarScope

public final class NavigationBarTransitions extends BarTransitions implements

        LightBarTransitionsController.DarkIntensityApplier {
@@ -83,13 +81,15 @@ public final class NavigationBarTransitions extends BarTransitions implements 
        }

    };



    @Inject

    public NavigationBarTransitions(

            NavigationBarView view,

            LightBarTransitionsController.Factory lightBarTransitionsControllerFactory) {

    public NavigationBarTransitions(NavigationBarView view, CommandQueue commandQueue) {

        super(view, R.drawable.nav_background);

        mView = view;

        mLightTransitionsController = lightBarTransitionsControllerFactory.create(this);

        mLightTransitionsController = new LightBarTransitionsController(

                view.getContext(),

                this,

                commandQueue,

                Dependency.get(KeyguardStateController.class),

                Dependency.get(StatusBarStateController.class));

        mAllowAutoDimWallpaperNotVisible = view.getContext().getResources()

                .getBoolean(R.bool.config_navigation_bar_enable_auto_dim_no_visible_wallpaper);

        mDarkIntensityListeners = new ArrayList();
@@ -127,7 +127,6 @@ public final class NavigationBarTransitions extends BarTransitions implements 
                    Display.DEFAULT_DISPLAY);

        } catch (RemoteException e) {

        }

        mLightTransitionsController.destroy();

    }



    @Override

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+7 −5
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import com.android.systemui.shared.rotation.RotationButtonController; 
import com.android.systemui.shared.system.ActivityManagerWrapper;

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

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

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.phone.AutoHideController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.LightBarTransitionsController;
@@ -139,7 +140,7 @@ public class NavigationBarView extends FrameLayout { 
    private EdgeBackGestureHandler mEdgeBackGestureHandler;

    private final DeadZone mDeadZone;

    private boolean mDeadZoneConsuming = false;

    private NavigationBarTransitions mBarTransitions;

    private final NavigationBarTransitions mBarTransitions;

    @Nullable

    private AutoHideController mAutoHideController;
@@ -369,6 +370,7 @@ public class NavigationBarView extends FrameLayout { 
        mConfiguration.updateFrom(context.getResources().getConfiguration());



        mScreenPinningNotify = new ScreenPinningNotify(mContext);

        mBarTransitions = new NavigationBarTransitions(this, Dependency.get(CommandQueue.class));



        mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back));

        mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home));
@@ -416,14 +418,14 @@ public class NavigationBarView extends FrameLayout { 
        }

    }



    void setBarTransitions(NavigationBarTransitions navigationBarTransitions) {

        mBarTransitions = navigationBarTransitions;

    }



    public void setAutoHideController(AutoHideController autoHideController) {

        mAutoHideController = autoHideController;

    }



    public NavigationBarTransitions getBarTransitions() {

        return mBarTransitions;

    }



    public LightBarTransitionsController getLightTransitionsController() {

        return mBarTransitions.getLightTransitionsController();

    }

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
            mWindowContext = null;

        }

        mAutoHideController.setNavigationBar(null);

        mLightBarTransitionsController.destroy();

        mLightBarTransitionsController.destroy(mContext);

        mLightBarController.setNavigationBar(null);

        mPipOptional.ifPresent(this::removePipExclusionBoundsChangeListener);

        mInitialized = false;

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ public class LightBarTransitionsController implements Dumpable, Callbacks, 
        mDisplayId = mContext.getDisplayId();

    }



    /** Call to cleanup the LightBarTransitionsController when done with it. */

    public void destroy() {

    public void destroy(Context context) {

        mCommandQueue.removeCallback(this);

        mStatusBarStateController.removeCallback(this);

    }