Sandbox changes for use in UXR prototype.
- "All Set" screen doesn't show after Home/Overview/Back tutorials. - X button in top left is hidden (we'll want to move this to the feedback view). - Feedback pops in and out from the top of the screen. - Hand animation is replaced by video feedback at start and after incorrect gesture. - Back tutorial goes left then right, in order to match video. - Updated strings and marked translatable (UX-reviewed already). - Added Chinese translations. - Many other things. Test: Manual Change-Id: I126a3ea0dad645014fab9cdee2ed19e06a8a56e9
This commit is contained in:
@@ -20,7 +20,6 @@ import static com.android.quickstep.interaction.TutorialController.TutorialType.
|
||||
import android.annotation.TargetApi;
|
||||
import android.graphics.PointF;
|
||||
import android.os.Build;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.launcher3.R;
|
||||
import com.android.quickstep.interaction.EdgeBackGestureHandler.BackGestureResult;
|
||||
@@ -61,11 +60,6 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
void onActionButtonClicked(View button) {
|
||||
mTutorialFragment.closeTutorial();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackGestureAttempted(BackGestureResult result) {
|
||||
switch (mTutorialType) {
|
||||
@@ -90,17 +84,16 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
|
||||
|
||||
@Override
|
||||
public void onNavBarGestureAttempted(NavBarGestureResult result, PointF finalVelocity) {
|
||||
if (mHideFeedbackEndAction != null) {
|
||||
return;
|
||||
}
|
||||
switch (mTutorialType) {
|
||||
case HOME_NAVIGATION:
|
||||
switch (result) {
|
||||
case HOME_GESTURE_COMPLETED: {
|
||||
animateFakeTaskViewHome(finalVelocity, () -> {
|
||||
if (mTutorialFragment.isTutorialComplete()) {
|
||||
mTutorialFragment.changeController(HOME_NAVIGATION_COMPLETE);
|
||||
} else {
|
||||
mTutorialFragment.continueTutorial();
|
||||
}
|
||||
});
|
||||
animateFakeTaskViewHome(finalVelocity, null);
|
||||
showFeedback(R.string.home_gesture_feedback_complete,
|
||||
mTutorialFragment::continueTutorial);
|
||||
break;
|
||||
}
|
||||
case HOME_NOT_STARTED_TOO_FAR_FROM_EDGE:
|
||||
@@ -108,12 +101,12 @@ final class HomeGestureTutorialController extends SwipeUpGestureTutorialControll
|
||||
showFeedback(R.string.home_gesture_feedback_swipe_too_far_from_edge);
|
||||
break;
|
||||
case OVERVIEW_GESTURE_COMPLETED:
|
||||
fadeOutFakeTaskView(true, () ->
|
||||
fadeOutFakeTaskView(true, true, () ->
|
||||
showFeedback(R.string.home_gesture_feedback_overview_detected));
|
||||
break;
|
||||
case HOME_OR_OVERVIEW_NOT_STARTED_WRONG_SWIPE_DIRECTION:
|
||||
case HOME_OR_OVERVIEW_CANCELLED:
|
||||
fadeOutFakeTaskView(false, null);
|
||||
fadeOutFakeTaskView(false, true, null);
|
||||
showFeedback(R.string.home_gesture_feedback_wrong_swipe_direction);
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user