Merge "Limit keyguard views on alt displays" into sc-dev am: b3deaf2b6d am: dcb1cbfcfb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15547527

Change-Id: I67521d43a083bc0dab4b5666e3eb35914d5be144
This commit is contained in:
Neha Jain
2021-08-13 19:14:56 +00:00
committed by Automerger Merge Worker
2 changed files with 20 additions and 0 deletions

View File

@@ -98,6 +98,8 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController; private final KeyguardUnlockAnimationController mKeyguardUnlockAnimationController;
private SmartspaceTransitionController mSmartspaceTransitionController; private SmartspaceTransitionController mSmartspaceTransitionController;
private boolean mOnlyClock = false;
@Inject @Inject
public KeyguardClockSwitchController( public KeyguardClockSwitchController(
KeyguardClockSwitch keyguardClockSwitch, KeyguardClockSwitch keyguardClockSwitch,
@@ -129,6 +131,13 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mSmartspaceTransitionController = smartspaceTransitionController; mSmartspaceTransitionController = smartspaceTransitionController;
} }
/**
* Mostly used for alternate displays, limit the information shown
*/
public void setOnlyClock(boolean onlyClock) {
mOnlyClock = onlyClock;
}
/** /**
* Attach the controller to the view it relates to. * Attach the controller to the view it relates to.
*/ */
@@ -169,6 +178,16 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
} }
mColorExtractor.addOnColorsChangedListener(mColorsListener); mColorExtractor.addOnColorsChangedListener(mColorsListener);
mView.updateColors(getGradientColors()); mView.updateColors(getGradientColors());
if (mOnlyClock) {
View ksa = mView.findViewById(R.id.keyguard_status_area);
ksa.setVisibility(View.GONE);
View nic = mView.findViewById(
R.id.left_aligned_notification_icon_container);
nic.setVisibility(View.GONE);
return;
}
updateAodIcons(); updateAodIcons();
if (mSmartspaceController.isSmartspaceEnabled()) { if (mSmartspaceController.isSmartspaceEnabled()) {

View File

@@ -332,6 +332,7 @@ public class KeyguardDisplayManager {
.build(findViewById(R.id.clock)) .build(findViewById(R.id.clock))
.getKeyguardClockSwitchController(); .getKeyguardClockSwitchController();
mKeyguardClockSwitchController.setOnlyClock(true);
mKeyguardClockSwitchController.init(); mKeyguardClockSwitchController.init();
} }