Merge "Removing OAV HIDDEN_GESTURE_RUNNING flag." into ub-launcher3-master

This commit is contained in:
Sreyas Rangaraju 2020-09-25 22:05:29 +00:00 committed by Android (Google) Code Review
commit de301593e8
2 changed files with 1 additions and 6 deletions

View File

@ -54,7 +54,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
HIDDEN_UNSUPPORTED_NAVIGATION,
HIDDEN_NON_ZERO_ROTATION,
HIDDEN_NO_TASKS,
HIDDEN_GESTURE_RUNNING,
HIDDEN_NO_RECENTS})
@Retention(RetentionPolicy.SOURCE)
public @interface ActionsHiddenFlags { }
@ -62,8 +61,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
public static final int HIDDEN_UNSUPPORTED_NAVIGATION = 1 << 0;
public static final int HIDDEN_NON_ZERO_ROTATION = 1 << 1;
public static final int HIDDEN_NO_TASKS = 1 << 2;
public static final int HIDDEN_GESTURE_RUNNING = 1 << 3;
public static final int HIDDEN_NO_RECENTS = 1 << 4;
public static final int HIDDEN_NO_RECENTS = 1 << 3;
@IntDef(flag = true, value = {
DISABLED_SCROLLING,

View File

@ -44,7 +44,6 @@ import static com.android.launcher3.userevent.nano.LauncherLogProto.ControlType.
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;
import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId;
import static com.android.quickstep.views.OverviewActionsView.HIDDEN_GESTURE_RUNNING;
import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION;
import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_RECENTS;
import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NO_TASKS;
@ -1130,7 +1129,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
setEnableDrawingLiveTile(false);
setRunningTaskHidden(true);
setRunningTaskIconScaledDown(true);
mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, true);
}
/**
@ -1330,7 +1328,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
}
private void animateActionsViewIn() {
mActionsView.updateHiddenFlags(HIDDEN_GESTURE_RUNNING, false);
ObjectAnimator anim = ObjectAnimator.ofFloat(
mActionsView.getVisibilityAlpha(), MultiValueAlpha.VALUE, 0, 1);
anim.setDuration(TaskView.SCALE_ICON_DURATION);