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

Merge "Temporarily disable recents onboarding"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-20 19:40:34 +00:00
committed by Android (Google) Code Review
parent 99f3dc8aee 1faff19f47
commit 196726ab00
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
View File

@@ -329,8 +329,9 @@ public class NavigationBarView extends FrameLayout implements
mContextualButtonGroup.addButton(accessibilityButton);
mOverviewProxyService = Dependency.get(OverviewProxyService.class);
mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);
mFloatingRotationButton = new FloatingRotationButton(context);
// TODO(165014649): Temporarily disable onboarding
// mRecentsOnboarding = new RecentsOnboarding(context, mOverviewProxyService);
mRotationButtonController = new RotationButtonController(mLightContext,
mLightIconColor, mDarkIconColor,
isGesturalMode ? mFloatingRotationButton : rotateSuggestionButton,
@@ -886,7 +887,9 @@ public class NavigationBarView extends FrameLayout implements
mNavBarMode = mode;
mBarTransitions.onNavigationModeChanged(mNavBarMode);
mEdgeBackGestureHandler.onNavigationModeChanged(mNavBarMode);
mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);
if (mRecentsOnboarding != null) {
mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);
}
if (isGesturalMode(mNavBarMode)) {
mRegionSamplingHelper.start(mSamplingBounds);
@@ -902,7 +905,9 @@ public class NavigationBarView extends FrameLayout implements
}
void hideRecentsOnboarding() {
mRecentsOnboarding.hide(true);
if (mRecentsOnboarding != null) {
mRecentsOnboarding.hide(true);
}
}
@Override
@@ -953,7 +958,9 @@ public class NavigationBarView extends FrameLayout implements
super.onLayout(changed, left, top, right, bottom);
notifyActiveTouchRegions();
mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());
if (mRecentsOnboarding != null) {
mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());
}
}
/**
@@ -1115,7 +1122,9 @@ public class NavigationBarView extends FrameLayout implements
boolean uiCarModeChanged = updateCarMode();
updateIcons(mTmpLastConfiguration);
updateRecentsIcon();
mRecentsOnboarding.onConfigurationChanged(mConfiguration);
if (mRecentsOnboarding != null) {
mRecentsOnboarding.onConfigurationChanged(mConfiguration);
}
if (uiCarModeChanged || mTmpLastConfiguration.densityDpi != mConfiguration.densityDpi
|| mTmpLastConfiguration.getLayoutDirection() != mConfiguration.getLayoutDirection()) {
// If car mode or density changes, we need to reset the icons.
@@ -1205,10 +1214,12 @@ public class NavigationBarView extends FrameLayout implements
}
private void setUpSwipeUpOnboarding(boolean connectedToOverviewProxy) {
if (connectedToOverviewProxy) {
mRecentsOnboarding.onConnectedToLauncher();
} else {
mRecentsOnboarding.onDisconnectedFromLauncher();
if (mRecentsOnboarding != null) {
if (connectedToOverviewProxy) {
mRecentsOnboarding.onConnectedToLauncher();
} else {
mRecentsOnboarding.onDisconnectedFromLauncher();
}
}
}
@@ -1254,7 +1265,9 @@ public class NavigationBarView extends FrameLayout implements
mNavigationInflaterView.dump(pw);
}
mContextualButtonGroup.dump(pw);
mRecentsOnboarding.dump(pw);
if (mRecentsOnboarding != null) {
mRecentsOnboarding.dump(pw);
}
mRegionSamplingHelper.dump(pw);
mEdgeBackGestureHandler.dump(pw);
}

4
services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java
View File

@@ -123,6 +123,10 @@ public class BiometricDeferredQueue {
final VerifyCredentialResponse response = spManager.verifyChallengeInternal(
getGatekeeperService(), userAuthInfo.gatekeeperPassword, challenge,
userAuthInfo.userId);
if (response == null) {
Slog.wtf(TAG, "VerifyChallenge failed, null response");
continue;
}
if (response.getResponseCode() != VerifyCredentialResponse.RESPONSE_OK) {
Slog.wtf(TAG, "VerifyChallenge failed, response: "
+ response.getResponseCode());