Merge "KeyguardBottomAreaView: cleanup." into tm-qpr-dev (bd23b317) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+0 −42

Original line number	Original line	Diff line number	Diff line
	@@ -83,48 +83,6 @@
	android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"		android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
	android:visibility="gone" />		android:visibility="gone" />

	<ImageView
	android:id="@+id/wallet_button"
	android:layout_height="@dimen/keyguard_affordance_fixed_height"
	android:layout_width="@dimen/keyguard_affordance_fixed_width"
	android:layout_gravity="bottom\|end"
	android:scaleType="center"
	android:tint="?android:attr/textColorPrimary"
	android:src="@drawable/ic_wallet_lockscreen"
	android:background="@drawable/keyguard_bottom_affordance_bg"
	android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"
	android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
	android:contentDescription="@string/accessibility_wallet_button"
	android:visibility="gone" />

	<ImageView
	android:id="@+id/qr_code_scanner_button"
	android:layout_height="@dimen/keyguard_affordance_fixed_height"
	android:layout_width="@dimen/keyguard_affordance_fixed_width"
	android:layout_gravity="bottom\|end"
	android:scaleType="center"
	android:tint="?android:attr/textColorPrimary"
	android:src="@drawable/ic_qr_code_scanner"
	android:background="@drawable/keyguard_bottom_affordance_bg"
	android:layout_marginEnd="@dimen/keyguard_affordance_horizontal_offset"
	android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
	android:contentDescription="@string/accessibility_qr_code_scanner_button"
	android:visibility="gone" />

	<ImageView
	android:id="@+id/controls_button"
	android:layout_height="@dimen/keyguard_affordance_fixed_height"
	android:layout_width="@dimen/keyguard_affordance_fixed_width"
	android:layout_gravity="bottom\|start"
	android:scaleType="center"
	android:tint="?android:attr/textColorPrimary"
	android:src="@drawable/controls_icon"
	android:background="@drawable/keyguard_bottom_affordance_bg"
	android:layout_marginStart="@dimen/keyguard_affordance_horizontal_offset"
	android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"
	android:contentDescription="@string/quick_controls_title"
	android:visibility="gone" />

	<FrameLayout		<FrameLayout
	android:id="@+id/overlay_container"		android:id="@+id/overlay_container"
	android:layout_width="match_parent"		android:layout_width="match_parent"

packages/SystemUI/src/com/android/keyguard/KeyguardUnfoldTransition.kt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -50,12 +50,10 @@ constructor(
	viewsIdToTranslate =		viewsIdToTranslate =
	setOf(		setOf(
	ViewIdToTranslate(R.id.keyguard_status_area, LEFT, filterNever),		ViewIdToTranslate(R.id.keyguard_status_area, LEFT, filterNever),
	ViewIdToTranslate(R.id.controls_button, LEFT, filterNever),
	ViewIdToTranslate(R.id.lockscreen_clock_view_large, LEFT, filterSplitShadeOnly),		ViewIdToTranslate(R.id.lockscreen_clock_view_large, LEFT, filterSplitShadeOnly),
	ViewIdToTranslate(R.id.lockscreen_clock_view, LEFT, filterNever),		ViewIdToTranslate(R.id.lockscreen_clock_view, LEFT, filterNever),
	ViewIdToTranslate(		ViewIdToTranslate(
	R.id.notification_stack_scroller, RIGHT, filterSplitShadeOnly),		R.id.notification_stack_scroller, RIGHT, filterSplitShadeOnly),
	ViewIdToTranslate(R.id.wallet_button, RIGHT, filterNever),
	ViewIdToTranslate(R.id.start_button, LEFT, filterNever),		ViewIdToTranslate(R.id.start_button, LEFT, filterNever),
	ViewIdToTranslate(R.id.end_button, RIGHT, filterNever)),		ViewIdToTranslate(R.id.end_button, RIGHT, filterNever)),
	progressProvider = unfoldProgressProvider)		progressProvider = unfoldProgressProvider)

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -92,13 +92,6 @@ public class Flags {
	public static final ResourceBooleanFlag FACE_SCANNING_ANIM =		public static final ResourceBooleanFlag FACE_SCANNING_ANIM =
	new ResourceBooleanFlag(205, R.bool.config_enableFaceScanningAnimation);		new ResourceBooleanFlag(205, R.bool.config_enableFaceScanningAnimation);

	/**
	* Whether the KeyguardBottomArea(View\|Controller) should use the modern architecture or the old
	* one.
	*/
	public static final ReleasedFlag MODERN_BOTTOM_AREA = new ReleasedFlag(206, true);


	public static final UnreleasedFlag LOCKSCREEN_CUSTOM_CLOCKS = new UnreleasedFlag(207);		public static final UnreleasedFlag LOCKSCREEN_CUSTOM_CLOCKS = new UnreleasedFlag(207);

	/**		/**

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+11 −39

Original line number	Original line	Diff line number	Diff line
	@@ -117,7 +117,6 @@ import com.android.systemui.biometrics.AuthController;
	import com.android.systemui.camera.CameraGestureHelper;		import com.android.systemui.camera.CameraGestureHelper;
	import com.android.systemui.classifier.Classifier;		import com.android.systemui.classifier.Classifier;
	import com.android.systemui.classifier.FalsingCollector;		import com.android.systemui.classifier.FalsingCollector;
	import com.android.systemui.controls.dagger.ControlsComponent;
	import com.android.systemui.dagger.SysUISingleton;		import com.android.systemui.dagger.SysUISingleton;
	import com.android.systemui.dagger.qualifiers.DisplayId;		import com.android.systemui.dagger.qualifiers.DisplayId;
	import com.android.systemui.dagger.qualifiers.Main;		import com.android.systemui.dagger.qualifiers.Main;
	@@ -140,7 +139,6 @@ import com.android.systemui.plugins.FalsingManager.FalsingTapListener;
	import com.android.systemui.plugins.qs.QS;		import com.android.systemui.plugins.qs.QS;
	import com.android.systemui.plugins.statusbar.StatusBarStateController;		import com.android.systemui.plugins.statusbar.StatusBarStateController;
	import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;		import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;
	import com.android.systemui.qrcodescanner.controller.QRCodeScannerController;
	import com.android.systemui.screenrecord.RecordingController;		import com.android.systemui.screenrecord.RecordingController;
	import com.android.systemui.shade.transition.ShadeTransitionController;		import com.android.systemui.shade.transition.ShadeTransitionController;
	import com.android.systemui.shared.system.QuickStepContract;		import com.android.systemui.shared.system.QuickStepContract;
	@@ -217,7 +215,6 @@ import com.android.systemui.util.LargeScreenUtils;
	import com.android.systemui.util.ListenerSet;		import com.android.systemui.util.ListenerSet;
	import com.android.systemui.util.Utils;		import com.android.systemui.util.Utils;
	import com.android.systemui.util.time.SystemClock;		import com.android.systemui.util.time.SystemClock;
	import com.android.systemui.wallet.controller.QuickAccessWalletController;
	import com.android.wm.shell.animation.FlingAnimationUtils;		import com.android.wm.shell.animation.FlingAnimationUtils;

	import java.io.PrintWriter;		import java.io.PrintWriter;
	@@ -325,9 +322,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	private final FragmentService mFragmentService;		private final FragmentService mFragmentService;
	private final ScrimController mScrimController;		private final ScrimController mScrimController;
	private final PrivacyDotViewController mPrivacyDotViewController;		private final PrivacyDotViewController mPrivacyDotViewController;
	private final QuickAccessWalletController mQuickAccessWalletController;
	private final QRCodeScannerController mQRCodeScannerController;
	private final ControlsComponent mControlsComponent;
	private final NotificationRemoteInputManager mRemoteInputManager;		private final NotificationRemoteInputManager mRemoteInputManager;

	private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;		private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
	@@ -696,8 +690,8 @@ public final class NotificationPanelViewController extends PanelViewController {
	};		};

	private final CameraGestureHelper mCameraGestureHelper;		private final CameraGestureHelper mCameraGestureHelper;
	private final Provider<KeyguardBottomAreaViewModel> mKeyguardBottomAreaViewModelProvider;		private final KeyguardBottomAreaViewModel mKeyguardBottomAreaViewModel;
	private final Provider<KeyguardBottomAreaInteractor> mKeyguardBottomAreaInteractorProvider;		private final KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor;

	@Inject		@Inject
	public NotificationPanelViewController(NotificationPanelView view,		public NotificationPanelViewController(NotificationPanelView view,
	@@ -746,8 +740,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	NavigationModeController navigationModeController,		NavigationModeController navigationModeController,
	FragmentService fragmentService,		FragmentService fragmentService,
	ContentResolver contentResolver,		ContentResolver contentResolver,
	QuickAccessWalletController quickAccessWalletController,
	QRCodeScannerController qrCodeScannerController,
	RecordingController recordingController,		RecordingController recordingController,
	LargeScreenShadeHeaderController largeScreenShadeHeaderController,		LargeScreenShadeHeaderController largeScreenShadeHeaderController,
	ScreenOffAnimationController screenOffAnimationController,		ScreenOffAnimationController screenOffAnimationController,
	@@ -755,7 +747,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	PanelExpansionStateManager panelExpansionStateManager,		PanelExpansionStateManager panelExpansionStateManager,
	NotificationRemoteInputManager remoteInputManager,		NotificationRemoteInputManager remoteInputManager,
	Optional<SysUIUnfoldComponent> unfoldComponent,		Optional<SysUIUnfoldComponent> unfoldComponent,
	ControlsComponent controlsComponent,
	InteractionJankMonitor interactionJankMonitor,		InteractionJankMonitor interactionJankMonitor,
	QsFrameTranslateController qsFrameTranslateController,		QsFrameTranslateController qsFrameTranslateController,
	SysUiState sysUiState,		SysUiState sysUiState,
	@@ -768,8 +759,8 @@ public final class NotificationPanelViewController extends PanelViewController {
	ShadeTransitionController shadeTransitionController,		ShadeTransitionController shadeTransitionController,
	SystemClock systemClock,		SystemClock systemClock,
	CameraGestureHelper cameraGestureHelper,		CameraGestureHelper cameraGestureHelper,
	Provider<KeyguardBottomAreaViewModel> keyguardBottomAreaViewModelProvider,		KeyguardBottomAreaViewModel keyguardBottomAreaViewModel,
	Provider<KeyguardBottomAreaInteractor> keyguardBottomAreaInteractorProvider) {		KeyguardBottomAreaInteractor keyguardBottomAreaInteractor) {
	super(view,		super(view,
	falsingManager,		falsingManager,
	dozeLog,		dozeLog,
	@@ -791,9 +782,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	mVibratorHelper = vibratorHelper;		mVibratorHelper = vibratorHelper;
	mKeyguardMediaController = keyguardMediaController;		mKeyguardMediaController = keyguardMediaController;
	mPrivacyDotViewController = privacyDotViewController;		mPrivacyDotViewController = privacyDotViewController;
	mQuickAccessWalletController = quickAccessWalletController;
	mQRCodeScannerController = qrCodeScannerController;
	mControlsComponent = controlsComponent;
	mMetricsLogger = metricsLogger;		mMetricsLogger = metricsLogger;
	mConfigurationController = configurationController;		mConfigurationController = configurationController;
	mFlingAnimationUtilsBuilder = flingAnimationUtilsBuilder;		mFlingAnimationUtilsBuilder = flingAnimationUtilsBuilder;
	@@ -897,7 +885,7 @@ public final class NotificationPanelViewController extends PanelViewController {

	mQsFrameTranslateController = qsFrameTranslateController;		mQsFrameTranslateController = qsFrameTranslateController;
	updateUserSwitcherFlags();		updateUserSwitcherFlags();
	mKeyguardBottomAreaViewModelProvider = keyguardBottomAreaViewModelProvider;		mKeyguardBottomAreaViewModel = keyguardBottomAreaViewModel;
	onFinishInflate();		onFinishInflate();
	keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener(		keyguardUnlockAnimationController.addKeyguardUnlockAnimationListener(
	new KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener() {		new KeyguardUnlockAnimationController.KeyguardUnlockAnimationListener() {
	@@ -951,7 +939,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	}		}
	});		});
	mCameraGestureHelper = cameraGestureHelper;		mCameraGestureHelper = cameraGestureHelper;
	mKeyguardBottomAreaInteractorProvider = keyguardBottomAreaInteractorProvider;		mKeyguardBottomAreaInteractor = keyguardBottomAreaInteractor;
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -1276,17 +1264,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	}		}

	private void initBottomArea() {		private void initBottomArea() {
	if (mFeatureFlags.isEnabled(Flags.MODERN_BOTTOM_AREA)) {		mKeyguardBottomArea.init(mKeyguardBottomAreaViewModel, mFalsingManager);
	mKeyguardBottomArea.init(mKeyguardBottomAreaViewModelProvider.get(), mFalsingManager);
	} else {
	// TODO(b/235403546): remove this method call when the new implementation is complete
	// and these are not needed.
	mKeyguardBottomArea.init(
	mFalsingManager,
	mQuickAccessWalletController,
	mControlsComponent,
	mQRCodeScannerController);
	}
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -1403,7 +1381,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	}		}

	mNotificationStackScrollLayoutController.setIntrinsicPadding(stackScrollerPadding);		mNotificationStackScrollLayoutController.setIntrinsicPadding(stackScrollerPadding);
	mKeyguardBottomArea.setAntiBurnInOffsetX(mClockPositionResult.clockX);

	mStackScrollerMeasuringPass++;		mStackScrollerMeasuringPass++;
	requestScrollerTopPaddingUpdate(animate);		requestScrollerTopPaddingUpdate(animate);
	@@ -1453,7 +1430,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	mKeyguardStatusViewController.getClockBottom(mStatusBarHeaderHeightKeyguard),		mKeyguardStatusViewController.getClockBottom(mStatusBarHeaderHeightKeyguard),
	mKeyguardStatusViewController.isClockTopAligned());		mKeyguardStatusViewController.isClockTopAligned());
	mClockPositionAlgorithm.run(mClockPositionResult);		mClockPositionAlgorithm.run(mClockPositionResult);
	mKeyguardBottomAreaInteractorProvider.get().setClockPosition(		mKeyguardBottomAreaInteractor.setClockPosition(
	mClockPositionResult.clockX, mClockPositionResult.clockY);		mClockPositionResult.clockX, mClockPositionResult.clockY);
	boolean animate = mNotificationStackScrollLayoutController.isAddOrRemoveAnimationPending();		boolean animate = mNotificationStackScrollLayoutController.isAddOrRemoveAnimationPending();
	boolean animateClock = (animate \|\| mAnimateNextPositionUpdate) && shouldAnimateClockChange;		boolean animateClock = (animate \|\| mAnimateNextPositionUpdate) && shouldAnimateClockChange;
	@@ -3296,8 +3273,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	getExpandedFraction());		getExpandedFraction());
	float alpha = Math.min(expansionAlpha, 1 - computeQsExpansionFraction());		float alpha = Math.min(expansionAlpha, 1 - computeQsExpansionFraction());
	alpha *= mBottomAreaShadeAlpha;		alpha *= mBottomAreaShadeAlpha;
	mKeyguardBottomArea.setComponentAlphas(alpha);		mKeyguardBottomAreaInteractor.setAlpha(alpha);
	mKeyguardBottomAreaInteractorProvider.get().setAlpha(alpha);
	mLockIconViewController.setAlpha(alpha);		mLockIconViewController.setAlpha(alpha);
	}		}

	@@ -3496,8 +3472,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	}		}

	private void updateDozingVisibilities(boolean animate) {		private void updateDozingVisibilities(boolean animate) {
	mKeyguardBottomArea.setDozing(mDozing, animate);		mKeyguardBottomAreaInteractor.setAnimateDozingTransitions(animate);
	mKeyguardBottomAreaInteractorProvider.get().setAnimateDozingTransitions(animate);
	if (!mDozing && animate) {		if (!mDozing && animate) {
	mKeyguardStatusBarViewController.animateKeyguardStatusBarIn();		mKeyguardStatusBarViewController.animateKeyguardStatusBarIn();
	}		}
	@@ -3799,8 +3774,7 @@ public final class NotificationPanelViewController extends PanelViewController {
	mView.setDozing(dozing);		mView.setDozing(dozing);
	mDozing = dozing;		mDozing = dozing;
	mNotificationStackScrollLayoutController.setDozing(mDozing, animate);		mNotificationStackScrollLayoutController.setDozing(mDozing, animate);
	mKeyguardBottomArea.setDozing(mDozing, animate);		mKeyguardBottomAreaInteractor.setAnimateDozingTransitions(animate);
	mKeyguardBottomAreaInteractorProvider.get().setAnimateDozingTransitions(animate);
	mKeyguardStatusBarViewController.setDozing(mDozing);		mKeyguardStatusBarViewController.setDozing(mDozing);

	if (dozing) {		if (dozing) {
	@@ -3849,7 +3823,6 @@ public final class NotificationPanelViewController extends PanelViewController {

	public void dozeTimeTick() {		public void dozeTimeTick() {
	mLockIconViewController.dozeTimeTick();		mLockIconViewController.dozeTimeTick();
	mKeyguardBottomArea.dozeTimeTick();
	mKeyguardStatusViewController.dozeTimeTick();		mKeyguardStatusViewController.dozeTimeTick();
	if (mInterpolatedDarkAmount > 0) {		if (mInterpolatedDarkAmount > 0) {
	positionClockAndNotifications();		positionClockAndNotifications();
	@@ -4672,7 +4645,6 @@ public final class NotificationPanelViewController extends PanelViewController {
	public void onDozeAmountChanged(float linearAmount, float amount) {		public void onDozeAmountChanged(float linearAmount, float amount) {
	mInterpolatedDarkAmount = amount;		mInterpolatedDarkAmount = amount;
	mLinearDarkAmount = linearAmount;		mLinearDarkAmount = linearAmount;
	mKeyguardBottomArea.setDarkAmount(mInterpolatedDarkAmount);
	positionClockAndNotifications();		positionClockAndNotifications();
	}		}
	}		}