diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index b2ff7709d4..f22a9d7dbe 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -37,5 +37,5 @@ - 150 + 72 diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index 7a968c1799..d74b6c5f1d 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides; import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT; +import static com.android.launcher3.anim.Interpolators.FINAL_FRAME; import static com.android.launcher3.anim.Interpolators.INSTANT; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE; @@ -113,9 +114,9 @@ public abstract class BaseRecentsViewStateController mRecentsView, getTaskModalnessProperty(), toState.getOverviewModalness(), config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR)); - setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, - toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f, - INSTANT); + boolean showAsGrid = toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()); + setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f, + showAsGrid ? INSTANT : FINAL_FRAME); } abstract FloatProperty getTaskModalnessProperty(); diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index c1c85de413..729710715a 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -68,13 +68,14 @@ public class TaskOverlayFactory implements ResourceBasedOverride { final BaseDraggingActivity activity = BaseActivity.fromContext(taskView.getContext()); for (TaskShortcutFactory menuOption : MENU_OPTIONS) { SystemShortcut shortcut = menuOption.getShortcut(activity, taskView); - if (menuOption == TaskShortcutFactory.SPLIT_SCREEN && - FeatureFlags.ENABLE_SPLIT_SELECT.get()) { - addSplitOptions(shortcuts, activity, taskView, deviceProfile); + if (shortcut == null) { continue; } - if (shortcut != null) { + if (menuOption == TaskShortcutFactory.SPLIT_SCREEN && + FeatureFlags.ENABLE_SPLIT_SELECT.get()) { + addSplitOptions(shortcuts, activity, taskView, deviceProfile); + } else { shortcuts.add(shortcut); } } diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index 854067b926..50b69dcff4 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -15,6 +15,7 @@ */ package com.android.quickstep.fallback; +import static com.android.launcher3.anim.Interpolators.FINAL_FRAME; import static com.android.launcher3.anim.Interpolators.INSTANT; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_MODAL; @@ -93,8 +94,9 @@ public class FallbackRecentsStateController implements StateHandler + + + + + + + + + + + + + + + + + diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml new file mode 100644 index 0000000000..21f269fed6 --- /dev/null +++ b/res/layout/work_mode_fab.xml @@ -0,0 +1,33 @@ + + + \ No newline at end of file diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml index 31953c72aa..538a180992 100644 --- a/res/layout/work_mode_switch.xml +++ b/res/layout/work_mode_switch.xml @@ -1,5 +1,4 @@ - - - + android:paddingTop="@dimen/work_profile_footer_padding" /> diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml deleted file mode 100644 index c3c7010f7e..0000000000 --- a/res/layout/work_profile_edu.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - -