Merge "[Bouncer] Remove KeyguardBouncer.java" into tm-qpr-dev (40a84fd9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerComponent.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,13 +20,13 @@ import android.view.ViewGroup;

		import com.android.keyguard.KeyguardHostViewController;
		import com.android.systemui.dagger.qualifiers.RootView;
		import com.android.systemui.statusbar.phone.KeyguardBouncer;
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor;

		import dagger.BindsInstance;
		import dagger.Subcomponent;

		/**
		* Dagger Subcomponent for the {@link KeyguardBouncer}.
		* Dagger Subcomponent for the {@link PrimaryBouncerInteractor}.
		*/
		@Subcomponent(modules = {KeyguardBouncerModule.class})
		@KeyguardBouncerScope

packages/SystemUI/src/com/android/keyguard/dagger/KeyguardBouncerModule.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import com.android.keyguard.KeyguardSecurityViewFlipper;
		import com.android.systemui.R;
		import com.android.systemui.biometrics.SideFpsController;
		import com.android.systemui.dagger.qualifiers.RootView;
		import com.android.systemui.statusbar.phone.KeyguardBouncer;
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor;

		import java.util.Optional;

		@@ -39,7 +39,7 @@ import dagger.Module;
		import dagger.Provides;

		/**
		* Module to create and access view related to the {@link KeyguardBouncer}.
		* Module to create and access view related to the {@link PrimaryBouncerInteractor}.
		*/
		@Module
		public interface KeyguardBouncerModule {

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.kt

+0 −29

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerInteractor
		import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants
		import com.android.systemui.lifecycle.repeatWhenAttached
		@@ -149,21 +148,6 @@ constructor(
		}
		}

		private val mPrimaryBouncerExpansionCallback: PrimaryBouncerExpansionCallback =
		object : PrimaryBouncerExpansionCallback {
		override fun onExpansionChanged(expansion: Float) {
		inputBouncerHiddenAmount = expansion
		updateAlpha()
		updatePauseAuth()
		}

		override fun onVisibilityChanged(isVisible: Boolean) {
		updateBouncerHiddenAmount()
		updateAlpha()
		updatePauseAuth()
		}
		}

		private val configurationListener: ConfigurationController.ConfigurationListener =
		object : ConfigurationController.ConfigurationListener {
		override fun onUiModeChanged() {
		@@ -315,14 +299,6 @@ constructor(
		statusBarState = statusBarStateController.state
		qsExpansion = keyguardViewManager.qsExpansion
		keyguardViewManager.addCallback(statusBarKeyguardViewManagerCallback)
		if (!isModernBouncerEnabled) {
		val bouncer = keyguardViewManager.primaryBouncer
		bouncer?.expansion?.let {
		mPrimaryBouncerExpansionCallback.onExpansionChanged(it)
		bouncer.addBouncerExpansionCallback(mPrimaryBouncerExpansionCallback)
		}
		updateBouncerHiddenAmount()
		}
		configurationController.addCallback(configurationListener)
		shadeExpansionStateManager.addExpansionListener(shadeExpansionListener)
		updateScaleFactor()
		@@ -352,11 +328,6 @@ constructor(
		}
		activityLaunchAnimator.removeListener(activityLaunchAnimatorListener)
		keyguardViewManager.removeCallback(statusBarKeyguardViewManagerCallback)
		if (!isModernBouncerEnabled) {
		keyguardViewManager.primaryBouncer?.removeBouncerExpansionCallback(
		mPrimaryBouncerExpansionCallback
		)
		}
		}

		override fun dump(pw: PrintWriter, args: Array<String>) {

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ import com.android.systemui.dreams.dagger.DreamOverlayModule;
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor;
		import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback;
		import com.android.systemui.statusbar.BlurUtils;
		import com.android.systemui.statusbar.phone.KeyguardBouncer;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		import com.android.systemui.util.ViewController;
		import com.android.systemui.util.concurrency.DelayableExecutor;

		@@ -56,7 +54,6 @@ import javax.inject.Named;
		@DreamOverlayComponent.DreamOverlayScope
		public class DreamOverlayContainerViewController extends ViewController<DreamOverlayContainerView> {
		private final DreamOverlayStatusBarViewController mStatusBarViewController;
		private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
		private final BlurUtils mBlurUtils;
		private final DreamOverlayAnimationsController mDreamOverlayAnimationsController;
		private final DreamOverlayStateController mStateController;
		@@ -133,7 +130,6 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve
		ComplicationHostViewController complicationHostViewController,
		@Named(DreamOverlayModule.DREAM_OVERLAY_CONTENT_VIEW) ViewGroup contentView,
		DreamOverlayStatusBarViewController statusBarViewController,
		StatusBarKeyguardViewManager statusBarKeyguardViewManager,
		BlurUtils blurUtils,
		@Main Handler handler,
		@Main Resources resources,
		@@ -147,7 +143,6 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve
		super(containerView);
		mDreamOverlayContentView = contentView;
		mStatusBarViewController = statusBarViewController;
		mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
		mBlurUtils = blurUtils;
		mDreamOverlayAnimationsController = animationsController;
		mStateController = stateController;
		@@ -179,10 +174,6 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve
		protected void onViewAttached() {
		mJitterStartTimeMillis = System.currentTimeMillis();
		mHandler.postDelayed(this::updateBurnInOffsets, mBurnInProtectionUpdateInterval);
		final KeyguardBouncer bouncer = mStatusBarKeyguardViewManager.getPrimaryBouncer();
		if (bouncer != null) {
		bouncer.addBouncerExpansionCallback(mBouncerExpansionCallback);
		}
		mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mBouncerExpansionCallback);

		// Start dream entry animations. Skip animations for low light clock.
		@@ -194,10 +185,6 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve
		@Override
		protected void onViewDetached() {
		mHandler.removeCallbacks(this::updateBurnInOffsets);
		final KeyguardBouncer bouncer = mStatusBarKeyguardViewManager.getPrimaryBouncer();
		if (bouncer != null) {
		bouncer.removeBouncerExpansionCallback(mBouncerExpansionCallback);
		}
		mPrimaryBouncerCallbackInteractor.removeBouncerExpansionCallback(mBouncerExpansionCallback);

		mDreamOverlayAnimationsController.cancelAnimations();

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardBouncerRepository.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import com.android.systemui.keyguard.shared.model.KeyguardBouncerModel
		import com.android.systemui.log.dagger.BouncerLog
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.log.table.logDiffsForTable
		import com.android.systemui.statusbar.phone.KeyguardBouncer
		import com.android.systemui.util.time.SystemClock
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope