Snap for 8494106 from 1582aafbc0 to tm-release

Change-Id: I140cc57842490248a9624443f1d89db60c50b6f7
This commit is contained in:
Android Build Coastguard Worker
2022-04-23 23:08:46 +00:00
2 changed files with 20 additions and 3 deletions
@@ -502,8 +502,10 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
private void onIsStashedChanged(boolean isStashed) {
mControllers.stashedHandleViewController.onIsStashedChanged(isStashed);
mControllers.taskbarInsetsController.onTaskbarWindowHeightOrInsetsChanged();
mControllers.runAfterInit(() -> {
mControllers.stashedHandleViewController.onIsStashedChanged(isStashed);
mControllers.taskbarInsetsController.onTaskbarWindowHeightOrInsetsChanged();
});
}
public void applyState() {
@@ -117,7 +117,22 @@ final class BackGestureTutorialController extends TutorialController {
mTutorialFragment.closeTutorial();
}
} else if (mTutorialType == BACK_NAVIGATION) {
showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
switch (result) {
case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
case OVERVIEW_NOT_STARTED_TOO_FAR_FROM_EDGE:
case HOME_OR_OVERVIEW_CANCELLED:
showFeedback(R.string.back_gesture_feedback_swipe_too_far_from_edge);
break;
case HOME_GESTURE_COMPLETED:
case OVERVIEW_GESTURE_COMPLETED:
case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
case ASSISTANT_COMPLETED:
case ASSISTANT_NOT_STARTED_BAD_ANGLE:
case ASSISTANT_NOT_STARTED_SWIPE_TOO_SHORT:
default:
showFeedback(R.string.back_gesture_feedback_swipe_in_nav_bar);
}
}
}
}