Merge "Remove FlingAnimationUtils.Builder provider." (35d00725) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -125,6 +125,7 @@ android_library {
	"protolog-lib",		"protolog-lib",
	"SettingsLib",		"SettingsLib",
	"WindowManager-Shell-proto",		"WindowManager-Shell-proto",
			"jsr330"
	],		],
	kotlincflags: ["-Xjvm-default=enable"],		kotlincflags: ["-Xjvm-default=enable"],
	manifest: "AndroidManifest.xml",		manifest: "AndroidManifest.xml",

libs/WindowManager/Shell/src/com/android/wm/shell/animation/FlingAnimationUtils.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,8 @@ import android.view.ViewPropertyAnimator;
	import android.view.animation.Interpolator;		import android.view.animation.Interpolator;
	import android.view.animation.PathInterpolator;		import android.view.animation.PathInterpolator;

			import javax.inject.Inject;

	/**		/**
	* Utility class to calculate general fling animation when the finger is released.		* Utility class to calculate general fling animation when the finger is released.
	*/		*/
	@@ -368,6 +370,7 @@ public class FlingAnimationUtils {
	float mX2;		float mX2;
	float mY2;		float mY2;

			@Inject
	public Builder(DisplayMetrics displayMetrics) {		public Builder(DisplayMetrics displayMetrics) {
	mDisplayMetrics = displayMetrics;		mDisplayMetrics = displayMetrics;
	reset();		reset();

packages/SystemUI/src/com/android/systemui/dagger/DependencyProvider.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ import android.os.HandlerThread;
	import android.os.Looper;		import android.os.Looper;
	import android.os.ServiceManager;		import android.os.ServiceManager;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.util.DisplayMetrics;
	import android.view.Choreographer;		import android.view.Choreographer;
	import android.view.IWindowManager;		import android.view.IWindowManager;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	@@ -141,16 +140,6 @@ public class DependencyProvider {
	return networkController.getDataSaverController();		return networkController.getDataSaverController();
	}		}

	/** */
	@Provides
	@SysUISingleton
	public DisplayMetrics provideDisplayMetrics(Context context, WindowManager windowManager) {
	DisplayMetrics displayMetrics = new DisplayMetrics();
	context.getDisplay().getMetrics(displayMetrics);
	return displayMetrics;
	}

	/** */
	@Provides		@Provides
	@SysUISingleton		@SysUISingleton
	public INotificationManager provideINotificationManager() {		public INotificationManager provideINotificationManager() {

packages/SystemUI/src/com/android/systemui/dagger/GlobalModule.java

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@ import com.android.internal.logging.UiEventLogger;
	import com.android.internal.logging.UiEventLoggerImpl;		import com.android.internal.logging.UiEventLoggerImpl;
	import com.android.systemui.dagger.qualifiers.TestHarness;		import com.android.systemui.dagger.qualifiers.TestHarness;
	import com.android.systemui.util.concurrency.GlobalConcurrencyModule;		import com.android.systemui.util.concurrency.GlobalConcurrencyModule;
	import com.android.wm.shell.animation.FlingAnimationUtils;

	import javax.inject.Singleton;		import javax.inject.Singleton;

	@@ -51,15 +50,12 @@ import dagger.Provides;
	GlobalConcurrencyModule.class})		GlobalConcurrencyModule.class})
	public class GlobalModule {		public class GlobalModule {

	// TODO(b/162923491): This should not be a singleton at all, the display metrics can change and		/** */
	// callers should be creating a new builder on demand
	@Singleton
	@Provides		@Provides
	static FlingAnimationUtils.Builder provideFlingAnimationUtilsBuilder(		public DisplayMetrics provideDisplayMetrics(Context context) {
	Context context) {
	DisplayMetrics displayMetrics = new DisplayMetrics();		DisplayMetrics displayMetrics = new DisplayMetrics();
	context.getDisplay().getMetrics(displayMetrics);		context.getDisplay().getMetrics(displayMetrics);
	return new FlingAnimationUtils.Builder(displayMetrics);		return displayMetrics;
	}		}

	/** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */		/** Provides an instance of {@link com.android.internal.logging.UiEventLogger} */

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

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -141,6 +141,7 @@ import java.util.function.Consumer;
	import java.util.function.Function;		import java.util.function.Function;

	import javax.inject.Inject;		import javax.inject.Inject;
			import javax.inject.Provider;

	@StatusBarComponent.StatusBarScope		@StatusBarComponent.StatusBarScope
	public class NotificationPanelViewController extends PanelViewController {		public class NotificationPanelViewController extends PanelViewController {
	@@ -185,7 +186,7 @@ public class NotificationPanelViewController extends PanelViewController {
	private final MetricsLogger mMetricsLogger;		private final MetricsLogger mMetricsLogger;
	private final ActivityManager mActivityManager;		private final ActivityManager mActivityManager;
	private final ConfigurationController mConfigurationController;		private final ConfigurationController mConfigurationController;
	private final FlingAnimationUtils.Builder mFlingAnimationUtilsBuilder;		private final Provider<FlingAnimationUtils.Builder> mFlingAnimationUtilsBuilder;
	private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;		private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;
	private final NotificationIconAreaController mNotificationIconAreaController;		private final NotificationIconAreaController mNotificationIconAreaController;

	@@ -536,7 +537,7 @@ public class NotificationPanelViewController extends PanelViewController {
	KeyguardUpdateMonitor keyguardUpdateMonitor, MetricsLogger metricsLogger,		KeyguardUpdateMonitor keyguardUpdateMonitor, MetricsLogger metricsLogger,
	ActivityManager activityManager,		ActivityManager activityManager,
	ConfigurationController configurationController,		ConfigurationController configurationController,
	FlingAnimationUtils.Builder flingAnimationUtilsBuilder,		Provider<FlingAnimationUtils.Builder> flingAnimationUtilsBuilder,
	StatusBarTouchableRegionManager statusBarTouchableRegionManager,		StatusBarTouchableRegionManager statusBarTouchableRegionManager,
	ConversationNotificationManager conversationNotificationManager,		ConversationNotificationManager conversationNotificationManager,
	MediaHierarchyManager mediaHierarchyManager,		MediaHierarchyManager mediaHierarchyManager,
	@@ -551,7 +552,7 @@ public class NotificationPanelViewController extends PanelViewController {
	MediaDataManager mediaDataManager) {		MediaDataManager mediaDataManager) {
	super(view, falsingManager, dozeLog, keyguardStateController,		super(view, falsingManager, dozeLog, keyguardStateController,
	(SysuiStatusBarStateController) statusBarStateController, vibratorHelper,		(SysuiStatusBarStateController) statusBarStateController, vibratorHelper,
	latencyTracker, flingAnimationUtilsBuilder, statusBarTouchableRegionManager);		latencyTracker, flingAnimationUtilsBuilder.get(), statusBarTouchableRegionManager);
	mView = view;		mView = view;
	mMetricsLogger = metricsLogger;		mMetricsLogger = metricsLogger;
	mActivityManager = activityManager;		mActivityManager = activityManager;
	@@ -690,7 +691,7 @@ public class NotificationPanelViewController extends PanelViewController {
	@Override		@Override
	protected void loadDimens() {		protected void loadDimens() {
	super.loadDimens();		super.loadDimens();
	mFlingAnimationUtils = mFlingAnimationUtilsBuilder.reset()		mFlingAnimationUtils = mFlingAnimationUtilsBuilder.get()
	.setMaxLengthSeconds(0.4f).build();		.setMaxLengthSeconds(0.4f).build();
	mStatusBarMinHeight = mResources.getDimensionPixelSize(		mStatusBarMinHeight = mResources.getDimensionPixelSize(
	com.android.internal.R.dimen.status_bar_height);		com.android.internal.R.dimen.status_bar_height);