Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev am: f667823a8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21136526 Change-Id: I116f965bdd77c65e7a82abb55e7aa0ce6dadcf19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -90,13 +90,8 @@ public class TaskbarKeyguardController implements TaskbarControllers.LoggableTas
|
||||
*/
|
||||
private void updateIconsForBouncer() {
|
||||
boolean disableBack = (mKeyguardSysuiFlags & SYSUI_STATE_BACK_DISABLED) != 0;
|
||||
boolean disableRecent = (mKeyguardSysuiFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0;
|
||||
boolean disableHome = (mKeyguardSysuiFlags & SYSUI_STATE_HOME_DISABLED) != 0;
|
||||
boolean onlyBackEnabled = !disableBack && disableRecent && disableHome;
|
||||
|
||||
boolean showBackForBouncer = onlyBackEnabled &&
|
||||
mKeyguardManager.isDeviceSecure() &&
|
||||
mBouncerShowing;
|
||||
boolean showBackForBouncer =
|
||||
!disableBack && mKeyguardManager.isDeviceSecure() && mBouncerShowing;
|
||||
mNavbarButtonsViewController.setBackForBouncer(showBackForBouncer);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user