Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix lockscreen wallpapers"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-25 00:28:45 +00:00
committed by Android (Google) Code Review
parent 5c978ad75b 0c29bafa19
commit f942dea677
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
View File

@@ -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.
*/

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

@@ -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();
}