Merge "Fix lockscreen wallpapers" (f942dea6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -525,16 +525,18 @@ public class NotificationMediaManager implements Dumpable {
		}

		public void setup(BackDropView backdrop, ImageView backdropFront, ImageView backdropBack,
		BiometricUnlockController biometricUnlockController, ScrimController scrimController,
		LockscreenWallpaper lockscreenWallpaper) {
		ScrimController scrimController, LockscreenWallpaper lockscreenWallpaper) {
		mBackdrop = backdrop;
		mBackdropFront = backdropFront;
		mBackdropBack = backdropBack;
		mBiometricUnlockController = biometricUnlockController;
		mScrimController = scrimController;
		mLockscreenWallpaper = lockscreenWallpaper;
		}

		public void setBiometricUnlockController(BiometricUnlockController biometricUnlockController) {
		mBiometricUnlockController = biometricUnlockController;
		}

		/**
		* Hide the album artwork that is fading out and release its bitmap.
		*/

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

+7 −6

Original line number	Diff line number	Diff line
		@@ -821,12 +821,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		mLockscreenWallpaper = new LockscreenWallpaper(mContext, this, mHandler);
		}

		mBackdrop = mStatusBarWindow.findViewById(R.id.backdrop);
		mBackdropFront = mBackdrop.findViewById(R.id.backdrop_front);
		mBackdropBack = mBackdrop.findViewById(R.id.backdrop_back);
		mMediaManager.setup(mBackdrop, mBackdropFront, mBackdropBack, mBiometricUnlockController,
		mScrimController, mLockscreenWallpaper);

		mKeyguardIndicationController =
		SystemUIFactory.getInstance().createKeyguardIndicationController(mContext,
		mStatusBarWindow.findViewById(R.id.keyguard_indication_area),
		@@ -874,6 +868,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		mDozeScrimController = new DozeScrimController(mScrimController, context,
		DozeParameters.getInstance(context));

		mBackdrop = mStatusBarWindow.findViewById(R.id.backdrop);
		mBackdropFront = mBackdrop.findViewById(R.id.backdrop_front);
		mBackdropBack = mBackdrop.findViewById(R.id.backdrop_back);
		mMediaManager.setup(mBackdrop, mBackdropFront, mBackdropBack,
		mScrimController, mLockscreenWallpaper);

		// Other icons
		mVolumeComponent = getComponent(VolumeComponent.class);

		@@ -1138,6 +1138,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		mKeyguardViewMediatorCallback = keyguardViewMediator.getViewMediatorCallback();
		mLightBarController.setBiometricUnlockController(mBiometricUnlockController);
		mMediaManager.setBiometricUnlockController(mBiometricUnlockController);
		Dependency.get(KeyguardDismissUtil.class).setDismissHandler(this::executeWhenUnlocked);
		Trace.endSection();
		}