Merge "Pass FalsingManager down through more classes." into qt-qpr1-sysui-dev (30f97c97) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,9 +61,9 @@ import com.android.systemui.Prefs;
		import com.android.systemui.R;
		import com.android.systemui.SystemUIFactory;
		import com.android.systemui.classifier.FalsingLog;
		import com.android.systemui.classifier.FalsingManagerFactory;
		import com.android.systemui.fragments.FragmentHostManager;
		import com.android.systemui.keyguard.ScreenLifecycle;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.qs.car.CarQSFragment;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		@@ -877,7 +877,7 @@ public class CarStatusBar extends StatusBar implements
		KeyguardUpdateMonitor.getInstance(mContext).dump(fd, pw, args);
		}

		FalsingManagerFactory.getInstance(mContext).dump(pw);
		Dependency.get(FalsingManager.class).dump(pw);
		FalsingLog.dump(pw);

		pw.println("SharedPreferences:");

packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackView.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -41,8 +41,10 @@ import android.widget.ScrollView;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.systemui.Dependency;
		import com.android.systemui.Interpolators;
		import com.android.systemui.R;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.recents.LegacyRecentsImpl;
		import com.android.systemui.recents.RecentsActivity;
		import com.android.systemui.recents.RecentsActivityLaunchState;
		@@ -86,15 +88,15 @@ import com.android.systemui.recents.events.ui.focus.NavigateTaskViewEvent;
		import com.android.systemui.recents.misc.DozeTrigger;
		import com.android.systemui.recents.misc.ReferenceCountedTrigger;
		import com.android.systemui.recents.misc.SystemServicesProxy;
		import com.android.systemui.recents.model.TaskStack;
		import com.android.systemui.recents.utilities.AnimationProps;
		import com.android.systemui.recents.utilities.Utilities;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.recents.model.TaskStack;
		import com.android.systemui.recents.views.grid.GridTaskView;
		import com.android.systemui.recents.views.grid.TaskGridLayoutAlgorithm;
		import com.android.systemui.recents.views.grid.TaskViewFocusFrame;

		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.system.ActivityManagerWrapper;

		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -256,7 +258,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		mLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, this);
		mStableLayoutAlgorithm = new TaskStackLayoutAlgorithm(context, null);
		mStackScroller = new TaskStackViewScroller(context, this, mLayoutAlgorithm);
		mTouchHandler = new TaskStackViewTouchHandler(context, this, mStackScroller);
		mTouchHandler = new TaskStackViewTouchHandler(
		context, this, mStackScroller, Dependency.get(FalsingManager.class));
		mAnimationHelper = new TaskStackAnimationHelper(context, this);
		mTaskCornerRadiusPx = LegacyRecentsImpl.getConfiguration().isGridEnabled ?
		res.getDimensionPixelSize(R.dimen.recents_grid_task_view_rounded_corners_radius) :

packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.systemui.Interpolators;
		import com.android.systemui.R;
		import com.android.systemui.SwipeHelper;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.recents.Constants;
		import com.android.systemui.recents.LegacyRecentsImpl;
		import com.android.systemui.recents.events.EventBus;
		@@ -107,7 +108,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		boolean mInterceptedBySwipeHelper;

		public TaskStackViewTouchHandler(Context context, TaskStackView sv,
		TaskStackViewScroller scroller) {
		TaskStackViewScroller scroller, FalsingManager falsingManager) {
		Resources res = context.getResources();
		ViewConfiguration configuration = ViewConfiguration.get(context);
		mContext = context;
		@@ -119,7 +120,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback {
		mWindowTouchSlop = configuration.getScaledWindowTouchSlop();
		mFlingAnimUtils = new FlingAnimationUtils(context, 0.2f);
		mOverscrollSize = res.getDimensionPixelSize(R.dimen.recents_fling_overscroll_distance);
		mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, context) {
		mSwipeHelper = new SwipeHelper(SwipeHelper.X, this, context, falsingManager) {
		@Override
		protected float getSize(View v) {
		return getScaledDismissSize();

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.view.View;
		import android.view.ViewConfiguration;
		import android.view.accessibility.AccessibilityEvent;

		import com.android.systemui.classifier.FalsingManagerFactory;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;
		import com.android.systemui.statusbar.FlingAnimationUtils;
		@@ -98,7 +97,8 @@ public class SwipeHelper implements Gefingerpoken {

		private final ArrayMap<View, Animator> mDismissPendingMap = new ArrayMap<>();

		public SwipeHelper(int swipeDirection, Callback callback, Context context) {
		public SwipeHelper(
		int swipeDirection, Callback callback, Context context, FalsingManager falsingManager) {
		mContext = context;
		mCallback = callback;
		mHandler = new Handler();
		@@ -113,7 +113,7 @@ public class SwipeHelper implements Gefingerpoken {
		mDensityScale = res.getDisplayMetrics().density;
		mFalsingThreshold = res.getDimensionPixelSize(R.dimen.swipe_helper_falsing_threshold);
		mFadeDependingOnAmountSwiped = res.getBoolean(R.bool.config_fadeDependingOnAmountSwiped);
		mFalsingManager = FalsingManagerFactory.getInstance(context);
		mFalsingManager = falsingManager;
		mFlingAnimationUtils = new FlingAnimationUtils(context, getMaxEscapeAnimDuration() / 1000f);
		}

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ import com.android.internal.widget.LockPatternUtils;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.ViewMediatorCallback;
		import com.android.systemui.assist.AssistManager;
		import com.android.systemui.classifier.FalsingManagerFactory;
		import com.android.systemui.dock.DockManager;
		import com.android.systemui.keyguard.DismissCallbackRegistry;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.power.EnhancedEstimates;
		import com.android.systemui.power.EnhancedEstimatesImpl;
		@@ -133,9 +133,10 @@ public class SystemUIFactory {
		public KeyguardBouncer createKeyguardBouncer(Context context, ViewMediatorCallback callback,
		LockPatternUtils lockPatternUtils, ViewGroup container,
		DismissCallbackRegistry dismissCallbackRegistry,
		KeyguardBouncer.BouncerExpansionCallback expansionCallback) {
		KeyguardBouncer.BouncerExpansionCallback expansionCallback,
		FalsingManager falsingManager) {
		return new KeyguardBouncer(context, callback, lockPatternUtils, container,
		dismissCallbackRegistry, FalsingManagerFactory.getInstance(context),
		dismissCallbackRegistry, falsingManager,
		expansionCallback, UnlockMethodCache.getInstance(context),
		KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper()));
		}