Merge "Add scrim below TaskMenu" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
db5f5f05e7
@@ -2612,10 +2612,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
clampToProgress(FINAL_FRAME, 0, 0.5f));
|
||||
});
|
||||
}
|
||||
boolean isTaskInBottomGridRow = showAsGrid() && !mTopRowIdSet.contains(
|
||||
taskView.getTaskViewId()) && taskView.getTaskViewId() != mFocusedTaskViewId;
|
||||
anim.setFloat(taskView, VIEW_ALPHA, 0,
|
||||
clampToProgress(isTaskInBottomGridRow ? ACCEL : FINAL_FRAME, 0, 0.5f));
|
||||
clampToProgress(isOnGridBottomRow(taskView) ? ACCEL : FINAL_FRAME, 0, 0.5f));
|
||||
FloatProperty<TaskView> secondaryViewTranslate =
|
||||
taskView.getSecondaryDissmissTranslationProperty();
|
||||
int secondaryTaskDimension = mOrientationHandler.getSecondaryDimension(taskView);
|
||||
@@ -4681,6 +4679,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
return position != -1 ? position : bottomRowIdArray.indexOf(taskView.getTaskViewId());
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the task in on the top of the grid
|
||||
*/
|
||||
public boolean isOnGridBottomRow(TaskView taskView) {
|
||||
return showAsGrid()
|
||||
&& !mTopRowIdSet.contains(taskView.getTaskViewId())
|
||||
&& taskView.getTaskViewId() != mFocusedTaskViewId;
|
||||
}
|
||||
|
||||
public Consumer<MotionEvent> getEventDispatcher(float navbarRotation) {
|
||||
float degreesRotated;
|
||||
if (navbarRotation == 0) {
|
||||
|
||||
Reference in New Issue
Block a user