diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index 842abc399f..7ab09c5ce9 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -103,16 +103,40 @@ android:clearTaskOnLaunch="true" android:exported="false"/> + + android:autoRemoveFromRecents="true" + android:excludeFromRecents="true" + android:screenOrientation="portrait" + android:permission="android.permission.REBOOT" + android:exported="true"> + + + + + + + + + + + + diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml new file mode 100644 index 0000000000..a6a17e5ebc --- /dev/null +++ b/quickstep/res/layout/activity_allset.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + diff --git a/quickstep/res/layout/overview_panel.xml b/quickstep/res/layout/overview_panel.xml index d7bcd9e932..f303f31199 100644 --- a/quickstep/res/layout/overview_panel.xml +++ b/quickstep/res/layout/overview_panel.xml @@ -15,12 +15,6 @@ --> - + + diff --git a/quickstep/res/values/attrs.xml b/quickstep/res/values/attrs.xml new file mode 100644 index 0000000000..336fb572d5 --- /dev/null +++ b/quickstep/res/values/attrs.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 9c0a083084..4f9b3ebe59 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -99,6 +99,13 @@ 24dp 18dp + + 40dp + 28dp + 80dp + 52dp + 24dp + 8dp 64dp diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index a0f1638c8a..7ada496c40 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -177,6 +177,15 @@ Tutorial %1$d/%2$d + + All set! + + Swipe up to go home + + You\u2019re ready to start using your phone + + Navigation settings for accessibility + Share diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 7c7d20a20a..0a8ecb8bde 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -59,7 +59,7 @@ parent="TextAppearance.GestureTutorial"> start ?android:attr/textColorPrimary - google-sans + google-sans-text 0.03 18sp 24sp @@ -99,6 +99,11 @@ @color/gesture_tutorial_primary_color + + Wallpapers - Styles & wallpapers + Wallpaper & style Home settings diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java index 20b4631dec..c1f3ac5e0d 100644 --- a/src/com/android/launcher3/AppWidgetResizeFrame.java +++ b/src/com/android/launcher3/AppWidgetResizeFrame.java @@ -57,6 +57,22 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O private final View[] mDragHandles = new View[HANDLE_COUNT]; private final List mSystemGestureExclusionRects = new ArrayList<>(HANDLE_COUNT); + private final OnAttachStateChangeListener mWidgetViewAttachStateChangeListener = + new OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View view) { + // Do nothing + } + + @Override + public void onViewDetachedFromWindow(View view) { + // When the app widget view is detached, we should close the resize frame. + // An example is when the dragging starts, the widget view is detached from + // CellLayout and then reattached to DragLayout. + close(false); + } + }; + private LauncherAppWidgetHostView mWidgetView; private CellLayout mCellLayout; @@ -177,7 +193,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O private void setupForWidget(LauncherAppWidgetHostView widgetView, CellLayout cellLayout, DragLayer dragLayer) { mCellLayout = cellLayout; + if (mWidgetView != null) { + mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); + } mWidgetView = widgetView; + mWidgetView.addOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo) widgetView.getAppWidgetInfo(); mResizeMode = info.resizeMode; @@ -628,6 +648,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O @Override protected void handleClose(boolean animate) { mDragLayer.removeView(this); + if (mWidgetView != null) { + mWidgetView.removeOnAttachStateChangeListener(mWidgetViewAttachStateChangeListener); + } } @Override diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index a5852ba828..dbdfb2b663 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -32,6 +32,7 @@ import com.android.launcher3.R; import com.android.launcher3.Workspace; import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragOptions; +import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.folder.Folder; import com.android.launcher3.keyboard.KeyboardDragAndDropView; import com.android.launcher3.model.data.AppInfo; @@ -290,7 +291,12 @@ public class LauncherAccessibilityDelegate extends AccessibilityDelegate impleme return actions; } - CellLayout layout = (CellLayout) host.getParent().getParent(); + CellLayout layout; + if (host.getParent() instanceof DragView) { + layout = (CellLayout) ((DragView) host.getParent()).getContentViewParent().getParent(); + } else { + layout = (CellLayout) host.getParent().getParent(); + } if ((providerInfo.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0) { if (layout.isRegionVacant(info.cellX + info.spanX, info.cellY, 1, info.spanY) || layout.isRegionVacant(info.cellX - 1, info.cellY, 1, info.spanY)) { diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 119a91ffba..b11b63ed69 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -75,7 +75,7 @@ import com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip.OnActivePag public class AllAppsContainerView extends SpringRelativeLayout implements DragSource, Insettable, OnDeviceProfileChangeListener, OnActivePageChangedListener { - private static final float FLING_VELOCITY_MULTIPLIER = 1800f; + private static final float FLING_VELOCITY_MULTIPLIER = 1000f; // Starts the springs after at least 25% of the animation has passed. private static final float FLING_ANIMATION_THRESHOLD = 0.25f; @@ -611,7 +611,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo public void onAnimationUpdate(ValueAnimator valueAnimator) { if (shouldSpring && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) { - absorbSwipeUpVelocity(-Math.abs( + absorbSwipeUpVelocity(Math.abs( Math.round(velocity * FLING_VELOCITY_MULTIPLIER))); shouldSpring = false; } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index c61c0d6d53..c4c7891d58 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -15,13 +15,15 @@ */ package com.android.launcher3.allapps; +import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT; -import static com.android.launcher3.LauncherState.OVERVIEW; -import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; +import static com.android.launcher3.anim.Interpolators.ACCEL_0_75; +import static com.android.launcher3.anim.Interpolators.ACCEL_2; +import static com.android.launcher3.anim.Interpolators.DEACCEL; +import static com.android.launcher3.anim.Interpolators.DEACCEL_2; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE; -import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE; import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS; import static com.android.launcher3.util.SystemUiController.UI_STATE_ALLAPPS; @@ -154,9 +156,9 @@ public class AllAppsTransitionController return; } - Interpolator interpolator = config.userControlled ? LINEAR : toState == OVERVIEW - ? config.getInterpolator(ANIM_OVERVIEW_SCALE, FAST_OUT_SLOW_IN) - : FAST_OUT_SLOW_IN; + Interpolator interpolator = toState.equals(ALL_APPS) + ? (config.userControlled ? ACCEL_2 : ACCEL_0_75) : + (config.userControlled ? DEACCEL_2 : DEACCEL); Animator anim = createSpringAnimation(mProgress, targetProgress); anim.setInterpolator(config.getInterpolator(ANIM_VERTICAL_PROGRESS, interpolator)); diff --git a/src/com/android/launcher3/model/data/SearchActionItemInfo.java b/src/com/android/launcher3/model/data/SearchActionItemInfo.java index b3057d5bd2..0eea92c691 100644 --- a/src/com/android/launcher3/model/data/SearchActionItemInfo.java +++ b/src/com/android/launcher3/model/data/SearchActionItemInfo.java @@ -94,6 +94,11 @@ public class SearchActionItemInfo extends ItemInfoWithIcon { "SearchActionItemInfo can only have either an Intent or a PendingIntent"); } mIntent = intent; + // bandage fix for just one week + if (intent != null && "com.android.server.telecom".equals(intent.getPackage())) { + intent.setAction(Intent.ACTION_DIAL); + intent.setPackage(null); + } } public PendingIntent getPendingIntent() { diff --git a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java index 2fd5efc3f6..44e55e102c 100644 --- a/src/com/android/launcher3/touch/LandscapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/LandscapePagedViewHandler.java @@ -159,6 +159,19 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { return VIEW_TRANSLATE_X; } + @Override + public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, + DeviceProfile dp) { + // Don't use device profile here because we know we're in fake landscape, only split option + // available is top/left + if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) { + // Top (visually left) side + return SPLIT_TRANSLATE_PRIMARY_NEGATIVE; + } + throw new IllegalStateException("Invalid split stage position: " + + splitPosition.mStagePosition); + } + @Override public int getPrimaryScroll(View view) { return view.getScrollY(); diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java index 6c2f17ee34..d8e5a485fd 100644 --- a/src/com/android/launcher3/touch/PagedOrientationHandler.java +++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java @@ -42,6 +42,10 @@ import java.util.List; */ public interface PagedOrientationHandler { + int SPLIT_TRANSLATE_PRIMARY_POSITIVE = 0; + int SPLIT_TRANSLATE_PRIMARY_NEGATIVE = 1; + int SPLIT_TRANSLATE_SECONDARY_NEGATIVE = 2; + PagedOrientationHandler PORTRAIT = new PortraitPagedViewHandler(); PagedOrientationHandler LANDSCAPE = new LandscapePagedViewHandler(); PagedOrientationHandler SEASCAPE = new SeascapePagedViewHandler(); @@ -71,6 +75,13 @@ public interface PagedOrientationHandler { int getSecondaryDimension(View view); FloatProperty getPrimaryViewTranslate(); FloatProperty getSecondaryViewTranslate(); + + /** + * @param splitPosition The position where the view to be split will go + * @return {@link #SPLIT_TRANSLATE_*} constants to indicate which direction the + * dismissal should happen + */ + int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, DeviceProfile dp); int getPrimaryScroll(View view); float getPrimaryScale(View view); int getChildStart(View view); diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java index f6a6448602..d3d77fd99a 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -155,6 +155,25 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { return VIEW_TRANSLATE_Y; } + @Override + public int getSplitTaskViewDismissDirection(SplitPositionOption splitPosition, + DeviceProfile dp) { + if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) { + if (dp.isLandscape) { + // Left side + return SPLIT_TRANSLATE_PRIMARY_NEGATIVE; + } else { + // Top side + return SPLIT_TRANSLATE_SECONDARY_NEGATIVE; + } + } else if (splitPosition.mStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) { + // We don't have a bottom option, so should be right + return SPLIT_TRANSLATE_PRIMARY_POSITIVE; + } + throw new IllegalStateException("Invalid split stage position: " + + splitPosition.mStagePosition); + } + @Override public int getPrimaryScroll(View view) { return view.getScrollX(); @@ -277,7 +296,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { } else { // Phone Portrait, LargeScreen Landscape/Portrait viewGroup.setOrientation(LinearLayout.HORIZONTAL); - lp.width = LinearLayout.LayoutParams.WRAP_CONTENT; + lp.width = LinearLayout.LayoutParams.MATCH_PARENT; } lp.height = LinearLayout.LayoutParams.WRAP_CONTENT; diff --git a/src/com/android/launcher3/util/UiThreadHelper.java b/src/com/android/launcher3/util/UiThreadHelper.java index be14e01f0d..f5e1234a28 100644 --- a/src/com/android/launcher3/util/UiThreadHelper.java +++ b/src/com/android/launcher3/util/UiThreadHelper.java @@ -48,7 +48,13 @@ public class UiThreadHelper { WindowInsets rootInsets = launcher.getRootView().getRootWindowInsets(); boolean isImeShown = rootInsets != null && rootInsets.isVisible( WindowInsets.Type.ime()); - if (!isImeShown) return; + if (isImeShown) { + // this call is already asynchronous + launcher.getAppsView().getWindowInsetsController().hide( + WindowInsets.Type.ime() + ); + } + return; } Message.obtain(HANDLER.get(launcher), MSG_HIDE_KEYBOARD, token).sendToTarget();