Merge "Use Provider for EdgeBackGestureHandler"

import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Provider;

import dagger.Lazy;

     */

    public static final String ALLOW_NOTIFICATION_LONG_PRESS_NAME = "allow_notif_longpress";

    /**

     * A provider of {@link EdgeBackGestureHandler}.

     */

    public static final String EDGE_BACK_GESTURE_HANDLER_PROVIDER_NAME =

            "edge_back_gesture_handler_provider";

    /**

     * Key for getting a background Looper for background work.

     */

     */

    public static final DependencyKey<String> LEAK_REPORT_EMAIL =

            new DependencyKey<>(LEAK_REPORT_EMAIL_NAME);

    /**

     * Key for retrieving an Provider<EdgeBackGestureHandler>.

     */

    public static final DependencyKey<Provider<EdgeBackGestureHandler>>

            EDGE_BACK_GESTURE_HANDLER_PROVIDER =

            new DependencyKey<>(EDGE_BACK_GESTURE_HANDLER_PROVIDER_NAME);

    private final ArrayMap<Object, Object> mDependencies = new ArrayMap<>();

    private final ArrayMap<Object, LazyDependencyCreator> mProviders = new ArrayMap<>();

    @Inject Lazy<TelephonyListenerManager> mTelephonyListenerManager;

    @Inject Lazy<SystemStatusAnimationScheduler> mSystemStatusAnimationSchedulerLazy;

    @Inject Lazy<PrivacyDotViewController> mPrivacyDotViewControllerLazy;

    @Inject Lazy<EdgeBackGestureHandler> mEdgeBackGestureHandler;

    @Inject Provider<EdgeBackGestureHandler> mEdgeBackGestureHandlerProvider;

    @Inject Lazy<UiEventLogger> mUiEventLogger;

    @Inject Lazy<InternetDialogFactory> mInternetDialogFactory;

    @Inject Lazy<FeatureFlags> mFeatureFlagsLazy;

        mProviders.put(SystemStatusAnimationScheduler.class,

                mSystemStatusAnimationSchedulerLazy::get);

        mProviders.put(PrivacyDotViewController.class, mPrivacyDotViewControllerLazy::get);

        mProviders.put(EdgeBackGestureHandler.class, mEdgeBackGestureHandler::get);

        mProviders.put(InternetDialogFactory.class, mInternetDialogFactory::get);

        mProviders.put(EDGE_BACK_GESTURE_HANDLER_PROVIDER, () -> mEdgeBackGestureHandlerProvider);

        mProviders.put(UiEventLogger.class, mUiEventLogger::get);

        mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get);

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;

import static com.android.systemui.Dependency.EDGE_BACK_GESTURE_HANDLER_PROVIDER;

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

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

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

        mNavColorSampleMargin = getResources()

                        .getDimensionPixelSize(R.dimen.navigation_handle_sample_horizontal_margin);

        mEdgeBackGestureHandler = Dependency.get(EdgeBackGestureHandler.class);

        mEdgeBackGestureHandler = Dependency.get(EDGE_BACK_GESTURE_HANDLER_PROVIDER).get();

        mEdgeBackGestureHandler.setStateChangeCallback(this::updateStates);

        mRegionSamplingHelper = new RegionSamplingHelper(this,

                new RegionSamplingHelper.SamplingCallback() {

import com.android.systemui.R;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.NavigationBarView;

/**

 * Utility class to handle edge swipes for back gesture

 */

@SysUISingleton

public class EdgeBackGestureHandler extends CurrentUserTracker

        implements PluginListener<NavigationEdgeBackPlugin>, ProtoTraceable<SystemUiTraceProto> {

package com.android.systemui.navigationbar;

import static com.android.systemui.Dependency.EDGE_BACK_GESTURE_HANDLER_PROVIDER;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.Mockito.mock;

import android.graphics.PixelFormat;

import android.hardware.display.DisplayManager;

        mDependency.injectMockDependency(OverviewProxyService.class);

        mDependency.injectMockDependency(KeyguardStateController.class);

        mDependency.injectMockDependency(NavigationBarController.class);

        mDependency.injectMockDependency(EdgeBackGestureHandler.class);

        mDependency.injectTestDependency(EDGE_BACK_GESTURE_HANDLER_PROVIDER,

                () -> mock(EdgeBackGestureHandler.class));

        mNavBar = new NavigationBarView(context, null);

    }

import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS;

import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_BUTTON_LONG_PRESS_DURATION_MS;

import static com.android.systemui.Dependency.EDGE_BACK_GESTURE_HANDLER_PROVIDER;

import static com.android.systemui.navigationbar.NavigationBar.NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS;

import static org.junit.Assert.assertEquals;

        mDependency.injectMockDependency(StatusBarStateController.class);

        mDependency.injectMockDependency(NavigationBarController.class);

        mOverviewProxyService = mDependency.injectMockDependency(OverviewProxyService.class);

        mDependency.injectMockDependency(EdgeBackGestureHandler.class);

        mDependency.injectTestDependency(EDGE_BACK_GESTURE_HANDLER_PROVIDER,

                () -> mock(EdgeBackGestureHandler.class));

        TestableLooper.get(this).runWithLooper(() -> {

            mNavigationBar = createNavBar(mContext);

            mExternalDisplayNavigationBar = createNavBar(mSysuiTestableContextExternal);