Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I210920679022e2d23df037fe8feee569d8bd8103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-10-04 13:53:03 +00:00
committed by Automerger Merge Worker
parent bea48a57e8 7aeec91de1
commit 91b091b2a3
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,6 @@ import android.window.BackEvent;
import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
import com.android.internal.policy.GestureNavigationSettingsObserver; import com.android.internal.policy.GestureNavigationSettingsObserver;
import com.android.internal.util.LatencyTracker;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Background;
@@ -199,7 +198,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private final Rect mNavBarOverlayExcludedBounds = new Rect(); private final Rect mNavBarOverlayExcludedBounds = new Rect();
private final Region mExcludeRegion = new Region(); private final Region mExcludeRegion = new Region();
private final Region mUnrestrictedExcludeRegion = new Region(); private final Region mUnrestrictedExcludeRegion = new Region();
private final LatencyTracker mLatencyTracker; private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;
private final Provider<BackGestureTfClassifierProvider> private final Provider<BackGestureTfClassifierProvider>
mBackGestureTfClassifierProviderProvider; mBackGestureTfClassifierProviderProvider;
private final FeatureFlags mFeatureFlags; private final FeatureFlags mFeatureFlags;
@@ -339,7 +338,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
IWindowManager windowManagerService, IWindowManager windowManagerService,
Optional<Pip> pipOptional, Optional<Pip> pipOptional,
FalsingManager falsingManager, FalsingManager falsingManager,
LatencyTracker latencyTracker, Provider<NavigationBarEdgePanel> navigationBarEdgePanelProvider,
Provider<BackGestureTfClassifierProvider> backGestureTfClassifierProviderProvider, Provider<BackGestureTfClassifierProvider> backGestureTfClassifierProviderProvider,
FeatureFlags featureFlags) { FeatureFlags featureFlags) {
super(broadcastDispatcher); super(broadcastDispatcher);
@@ -358,7 +357,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
mWindowManagerService = windowManagerService; mWindowManagerService = windowManagerService;
mPipOptional = pipOptional; mPipOptional = pipOptional;
mFalsingManager = falsingManager; mFalsingManager = falsingManager;
mLatencyTracker = latencyTracker; mNavBarEdgePanelProvider = navigationBarEdgePanelProvider;
mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider; mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
mLastReportedConfig.setTo(mContext.getResources().getConfiguration()); mLastReportedConfig.setTo(mContext.getResources().getConfiguration());
@@ -583,8 +582,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
setEdgeBackPlugin( setEdgeBackPlugin(
mBackPanelControllerFactory.create(mContext)); mBackPanelControllerFactory.create(mContext));
} else { } else {
setEdgeBackPlugin( setEdgeBackPlugin(mNavBarEdgePanelProvider.get());
new NavigationBarEdgePanel(mContext, mLatencyTracker));
} }
} }
@@ -1091,7 +1089,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private final IWindowManager mWindowManagerService; private final IWindowManager mWindowManagerService;
private final Optional<Pip> mPipOptional; private final Optional<Pip> mPipOptional;
private final FalsingManager mFalsingManager; private final FalsingManager mFalsingManager;
private final LatencyTracker mLatencyTracker; private final Provider<NavigationBarEdgePanel> mNavBarEdgePanelProvider;
private final Provider<BackGestureTfClassifierProvider> private final Provider<BackGestureTfClassifierProvider>
mBackGestureTfClassifierProviderProvider; mBackGestureTfClassifierProviderProvider;
private final FeatureFlags mFeatureFlags; private final FeatureFlags mFeatureFlags;
@@ -1111,7 +1109,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
IWindowManager windowManagerService, IWindowManager windowManagerService,
Optional<Pip> pipOptional, Optional<Pip> pipOptional,
FalsingManager falsingManager, FalsingManager falsingManager,
LatencyTracker latencyTracker, Provider<NavigationBarEdgePanel> navBarEdgePanelProvider,
Provider<BackGestureTfClassifierProvider> Provider<BackGestureTfClassifierProvider>
backGestureTfClassifierProviderProvider, backGestureTfClassifierProviderProvider,
FeatureFlags featureFlags) { FeatureFlags featureFlags) {
@@ -1129,7 +1127,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
mWindowManagerService = windowManagerService; mWindowManagerService = windowManagerService;
mPipOptional = pipOptional; mPipOptional = pipOptional;
mFalsingManager = falsingManager; mFalsingManager = falsingManager;
mLatencyTracker = latencyTracker; mNavBarEdgePanelProvider = navBarEdgePanelProvider;
mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider; mBackGestureTfClassifierProviderProvider = backGestureTfClassifierProviderProvider;
mFeatureFlags = featureFlags; mFeatureFlags = featureFlags;
} }
@@ -1152,7 +1150,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
mWindowManagerService, mWindowManagerService,
mPipOptional, mPipOptional,
mFalsingManager, mFalsingManager,
mLatencyTracker, mNavBarEdgePanelProvider,
mBackGestureTfClassifierProviderProvider, mBackGestureTfClassifierProviderProvider,
mFeatureFlags); mFeatureFlags);
} }

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

@@ -52,9 +52,9 @@ import androidx.dynamicanimation.animation.SpringForce;
import com.android.internal.util.LatencyTracker; import com.android.internal.util.LatencyTracker;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.systemui.Dependency;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.animation.Interpolators; import com.android.systemui.animation.Interpolators;
import com.android.systemui.dagger.qualifiers.Background;
import com.android.systemui.plugins.NavigationEdgeBackPlugin; import com.android.systemui.plugins.NavigationEdgeBackPlugin;
import com.android.systemui.shared.navigationbar.RegionSamplingHelper; import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
import com.android.systemui.statusbar.VibratorHelper; import com.android.systemui.statusbar.VibratorHelper;
@@ -62,6 +62,8 @@ import com.android.systemui.statusbar.VibratorHelper;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import javax.inject.Inject;
public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPlugin { public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPlugin {
private static final String TAG = "NavigationBarEdgePanel"; private static final String TAG = "NavigationBarEdgePanel";
@@ -282,11 +284,16 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
}; };
private BackCallback mBackCallback; private BackCallback mBackCallback;
public NavigationBarEdgePanel(Context context, LatencyTracker latencyTracker) { @Inject
public NavigationBarEdgePanel(
Context context,
LatencyTracker latencyTracker,
VibratorHelper vibratorHelper,
@Background Executor backgroundExecutor) {
super(context); super(context);
mWindowManager = context.getSystemService(WindowManager.class); mWindowManager = context.getSystemService(WindowManager.class);
mVibratorHelper = Dependency.get(VibratorHelper.class); mVibratorHelper = vibratorHelper;
mDensity = context.getResources().getDisplayMetrics().density; mDensity = context.getResources().getDisplayMetrics().density;
@@ -358,7 +365,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl
setVisibility(GONE); setVisibility(GONE);
Executor backgroundExecutor = Dependency.get(Dependency.BACKGROUND_EXECUTOR);
boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY; boolean isPrimaryDisplay = mContext.getDisplayId() == DEFAULT_DISPLAY;
mRegionSamplingHelper = new RegionSamplingHelper(this, mRegionSamplingHelper = new RegionSamplingHelper(this,
new RegionSamplingHelper.SamplingCallback() { new RegionSamplingHelper.SamplingCallback() {