Merge "Temporarily disable recents onboarding" (196726ab) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+23 −10

Original line number	Diff line number	Diff line
		@@ -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);
		if (mRecentsOnboarding != null) {
		mRecentsOnboarding.onNavigationModeChanged(mNavBarMode);
		}

		if (isGesturalMode(mNavBarMode)) {
		mRegionSamplingHelper.start(mSamplingBounds);
		@@ -902,8 +905,10 @@ public class NavigationBarView extends FrameLayout implements
		}

		void hideRecentsOnboarding() {
		if (mRecentsOnboarding != null) {
		mRecentsOnboarding.hide(true);
		}
		}

		@Override
		public void onFinishInflate() {
		@@ -953,8 +958,10 @@ public class NavigationBarView extends FrameLayout implements
		super.onLayout(changed, left, top, right, bottom);

		notifyActiveTouchRegions();
		if (mRecentsOnboarding != null) {
		mRecentsOnboarding.setNavBarHeight(getMeasuredHeight());
		}
		}

		/**
		* Notifies the overview service of the active touch regions.
		@@ -1115,7 +1122,9 @@ public class NavigationBarView extends FrameLayout implements
		boolean uiCarModeChanged = updateCarMode();
		updateIcons(mTmpLastConfiguration);
		updateRecentsIcon();
		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,12 +1214,14 @@ public class NavigationBarView extends FrameLayout implements
		}

		private void setUpSwipeUpOnboarding(boolean connectedToOverviewProxy) {
		if (mRecentsOnboarding != null) {
		if (connectedToOverviewProxy) {
		mRecentsOnboarding.onConnectedToLauncher();
		} else {
		mRecentsOnboarding.onDisconnectedFromLauncher();
		}
		}
		}

		public void dump(PrintWriter pw) {
		final Rect r = new Rect();
		@@ -1254,7 +1265,9 @@ public class NavigationBarView extends FrameLayout implements
		mNavigationInflaterView.dump(pw);
		}
		mContextualButtonGroup.dump(pw);
		if (mRecentsOnboarding != null) {
		mRecentsOnboarding.dump(pw);
		}
		mRegionSamplingHelper.dump(pw);
		mEdgeBackGestureHandler.dump(pw);
		}

services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -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());