This greatly reduces the the jank of the taskbar being shown above the lockscreen. Before: http://shortn/_PhXhkWR73t After: http://shortn/_MC3ZLGHp4o Bug: 264604213 Test: manual (http://shortn/_ISEXThUFM2), tapl Change-Id: Ib1c5dbaafd4d0e1d69fbc03d908632e0275c8a0b
109 lines
5.0 KiB
Java
109 lines
5.0 KiB
Java
package com.android.launcher3.taskbar;
|
|
|
|
import static com.android.launcher3.AbstractFloatingView.TYPE_ALL;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SCREEN_STATE_OFF;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_ON;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_STATE_MASK;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
|
|
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
|
|
|
|
import android.app.KeyguardManager;
|
|
|
|
import com.android.launcher3.AbstractFloatingView;
|
|
import com.android.systemui.shared.system.QuickStepContract;
|
|
|
|
import java.io.PrintWriter;
|
|
|
|
/**
|
|
* Controller for managing keyguard state for taskbar
|
|
*/
|
|
public class TaskbarKeyguardController implements TaskbarControllers.LoggableTaskbarController {
|
|
|
|
private static final int KEYGUARD_SYSUI_FLAGS = SYSUI_STATE_BOUNCER_SHOWING
|
|
| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING | SYSUI_STATE_DEVICE_DOZING
|
|
| SYSUI_STATE_OVERVIEW_DISABLED | SYSUI_STATE_HOME_DISABLED
|
|
| SYSUI_STATE_BACK_DISABLED | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED
|
|
| SYSUI_STATE_SCREEN_STATE_MASK;
|
|
|
|
// If any of these SysUi flags (via QuickstepContract) is set, the device to be considered
|
|
// locked.
|
|
public static final int MASK_ANY_SYSUI_LOCKED = SYSUI_STATE_BOUNCER_SHOWING
|
|
| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
|
|
| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED
|
|
| SYSUI_STATE_DEVICE_DREAMING;
|
|
|
|
private final TaskbarActivityContext mContext;
|
|
private int mKeyguardSysuiFlags;
|
|
private boolean mBouncerShowing;
|
|
private NavbarButtonsViewController mNavbarButtonsViewController;
|
|
private final KeyguardManager mKeyguardManager;
|
|
|
|
public TaskbarKeyguardController(TaskbarActivityContext context) {
|
|
mContext = context;
|
|
mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
|
|
}
|
|
|
|
public void init(NavbarButtonsViewController navbarButtonUIController) {
|
|
mNavbarButtonsViewController = navbarButtonUIController;
|
|
}
|
|
|
|
public void updateStateForSysuiFlags(int systemUiStateFlags) {
|
|
int interestingKeyguardFlags = systemUiStateFlags & KEYGUARD_SYSUI_FLAGS;
|
|
if (interestingKeyguardFlags == mKeyguardSysuiFlags) {
|
|
// No change in keyguard relevant flags
|
|
return;
|
|
}
|
|
mKeyguardSysuiFlags = interestingKeyguardFlags;
|
|
|
|
boolean bouncerShowing = (systemUiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0;
|
|
boolean keyguardShowing = (systemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING)
|
|
!= 0;
|
|
boolean keyguardOccluded =
|
|
(systemUiStateFlags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0;
|
|
boolean dozing = (systemUiStateFlags & SYSUI_STATE_DEVICE_DOZING) != 0;
|
|
|
|
|
|
mBouncerShowing = bouncerShowing;
|
|
|
|
mNavbarButtonsViewController.setKeyguardVisible(keyguardShowing || dozing,
|
|
keyguardOccluded);
|
|
updateIconsForBouncer();
|
|
|
|
boolean screenOffOrTransitioningOff = (systemUiStateFlags & SYSUI_STATE_SCREEN_ON) == 0;
|
|
boolean closeFloatingViews = keyguardShowing || screenOffOrTransitioningOff;
|
|
|
|
if (closeFloatingViews) {
|
|
// animate the closing of the views, unless the screen is already fully turned off.
|
|
boolean animateViewClosing =
|
|
(systemUiStateFlags & SYSUI_STATE_SCREEN_STATE_MASK) != SCREEN_STATE_OFF;
|
|
AbstractFloatingView.closeOpenViews(mContext, animateViewClosing, TYPE_ALL);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Hides/shows taskbar when keyguard is up
|
|
*/
|
|
private void updateIconsForBouncer() {
|
|
boolean disableBack = (mKeyguardSysuiFlags & SYSUI_STATE_BACK_DISABLED) != 0;
|
|
boolean showBackForBouncer =
|
|
!disableBack && mKeyguardManager.isDeviceSecure() && mBouncerShowing;
|
|
mNavbarButtonsViewController.setBackForBouncer(showBackForBouncer);
|
|
}
|
|
|
|
|
|
@Override
|
|
public void dumpLogs(String prefix, PrintWriter pw) {
|
|
pw.println(prefix + "TaskbarKeyguardController:");
|
|
|
|
pw.println(prefix + "\tmKeyguardSysuiFlags=" + QuickStepContract.getSystemUiStateString(
|
|
mKeyguardSysuiFlags));
|
|
pw.println(prefix + "\tmBouncerShowing=" + mBouncerShowing);
|
|
}
|
|
}
|