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

Commit 91b091b2 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Removed Dependency.get usage from systemui.navigationbar.gestural" into... 

Merge "Removed Dependency.get usage from systemui.navigationbar.gestural" into tm-qpr-dev am: 7aeec91d

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



Change-Id: I210920679022e2d23df037fe8feee569d8bd8103
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bea48a57 7aeec91d

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+8 −10
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.window.BackEvent; 


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

import com.android.internal.policy.GestureNavigationSettingsObserver;

import com.android.internal.util.LatencyTracker;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dagger.qualifiers.Background;
@@ -199,7 +198,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    private final Rect mNavBarOverlayExcludedBounds = new Rect();

    private final Region mExcludeRegion = new Region();

    private final Region mUnrestrictedExcludeRegion = new Region();

    private final LatencyTracker mLatencyTracker;

    private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;

    private final Provider<BackGestureTfClassifierProvider>

            mBackGestureTfClassifierProviderProvider;

    private final FeatureFlags mFeatureFlags;
@@ -339,7 +338,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
            IWindowManager windowManagerService,

            Optional<Pip> pipOptional,

            FalsingManager falsingManager,

            LatencyTracker latencyTracker,

            Provider<NavigationBarEdgePanel> navigationBarEdgePanelProvider,

            Provider<BackGestureTfClassifierProvider> backGestureTfClassifierProviderProvider,

            FeatureFlags featureFlags) {

        super(broadcastDispatcher);
@@ -358,7 +357,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
        mWindowManagerService = windowManagerService;

        mPipOptional = pipOptional;

        mFalsingManager = falsingManager;

        mLatencyTracker = latencyTracker;

        mNavBarEdgePanelProvider = navigationBarEdgePanelProvider;

        mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;

        mFeatureFlags = featureFlags;

        mLastReportedConfig.setTo(mContext.getResources().getConfiguration());
@@ -583,8 +582,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
            setEdgeBackPlugin(

                    mBackPanelControllerFactory.create(mContext));

        } else {

            setEdgeBackPlugin(

                    new NavigationBarEdgePanel(mContext, mLatencyTracker));

            setEdgeBackPlugin(mNavBarEdgePanelProvider.get());

        }

    }
@@ -1091,7 +1089,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
        private final IWindowManager mWindowManagerService;

        private final Optional<Pip> mPipOptional;

        private final FalsingManager mFalsingManager;

        private final LatencyTracker mLatencyTracker;

        private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;

        private final Provider<BackGestureTfClassifierProvider>

                mBackGestureTfClassifierProviderProvider;

        private final FeatureFlags mFeatureFlags;
@@ -1111,7 +1109,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
                       IWindowManager windowManagerService,

                       Optional<Pip> pipOptional,

                       FalsingManager falsingManager,

                       LatencyTracker latencyTracker,

                       Provider<NavigationBarEdgePanel> navBarEdgePanelProvider,

                       Provider<BackGestureTfClassifierProvider>

                               backGestureTfClassifierProviderProvider,

                       FeatureFlags featureFlags) {
@@ -1129,7 +1127,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
            mWindowManagerService = windowManagerService;

            mPipOptional = pipOptional;

            mFalsingManager = falsingManager;

            mLatencyTracker = latencyTracker;

            mNavBarEdgePanelProvider = navBarEdgePanelProvider;

            mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;

            mFeatureFlags = featureFlags;

        }
@@ -1152,7 +1150,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
                    mWindowManagerService,

                    mPipOptional,

                    mFalsingManager,

                    mLatencyTracker,

                    mNavBarEdgePanelProvider,

                    mBackGestureTfClassifierProviderProvider,

                    mFeatureFlags);

        }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+10 −4
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ import androidx.dynamicanimation.animation.SpringForce; 


import com.android.internal.util.LatencyTracker;

import com.android.settingslib.Utils;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.animation.Interpolators;

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

import com.android.systemui.plugins.NavigationEdgeBackPlugin;

import com.android.systemui.shared.navigationbar.RegionSamplingHelper;

import com.android.systemui.statusbar.VibratorHelper;
@@ -62,6 +62,8 @@ import com.android.systemui.statusbar.VibratorHelper; 
import java.io.PrintWriter;

import java.util.concurrent.Executor;



import javax.inject.Inject;



public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPlugin {



    private static final String TAG = "NavigationBarEdgePanel";
@@ -282,11 +284,16 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
            };

    private BackCallback mBackCallback;



    public NavigationBarEdgePanel(Context context, LatencyTracker latencyTracker) {

    @Inject

    public NavigationBarEdgePanel(

            Context context,

            LatencyTracker latencyTracker,

            VibratorHelper vibratorHelper,

            @Background Executor backgroundExecutor) {

        super(context);



        mWindowManager = context.getSystemService(WindowManager.class);

        mVibratorHelper = Dependency.get(VibratorHelper.class);

        mVibratorHelper = vibratorHelper;



        mDensity = context.getResources().getDisplayMetrics().density;
@@ -358,7 +365,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 


        setVisibility(GONE);



        Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);

        boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY;

        mRegionSamplingHelper = new RegionSamplingHelper(this,

                new RegionSamplingHelper.SamplingCallback() {