Merge "Refactoring PagedOrientationHandler to extract functions from to quickstep" into main
This commit is contained in:
Jordan Silva
Android (Google) Code Review
@@ -118,7 +118,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
|
||||
private float mTotalMotion;
|
||||
// Used in special cases where the fling checks can be relaxed for an intentional gesture
|
||||
private boolean mAllowEasyFling;
|
||||
protected PagedOrientationHandler mOrientationHandler = PagedOrientationHandler.PORTRAIT;
|
||||
private PagedOrientationHandler mOrientationHandler =
|
||||
PagedOrientationHandler.DEFAULT;
|
||||
|
||||
private final ArrayList<Runnable> mOnPageScrollsInitializedCallbacks = new ArrayList<>();
|
||||
|
||||
@@ -231,6 +232,14 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
|
||||
return getChildAt(index);
|
||||
}
|
||||
|
||||
protected PagedOrientationHandler getPagedOrientationHandler() {
|
||||
return mOrientationHandler;
|
||||
}
|
||||
|
||||
protected void setOrientationHandler(PagedOrientationHandler orientationHandler) {
|
||||
this.mOrientationHandler = orientationHandler;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the scroll of the current page immediately to its final scroll position. We use this
|
||||
* in CustomizePagedView to allow tabs to share the same PagedView while resetting the scroll of
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.touch;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Rect;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.VelocityTracker;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
|
||||
import com.android.launcher3.Utilities;
|
||||
|
||||
public class DefaultPagedViewHandler implements PagedOrientationHandler {
|
||||
@Override
|
||||
public int getPrimaryValue(int x, int y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryValue(int x, int y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryValue(float x, float y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSecondaryValue(float x, float y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Int2DAction<T> action, int param) {
|
||||
action.call(target, param, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Float2DAction<T> action, float param) {
|
||||
action.call(target, param, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryDirection(MotionEvent event, int pointerIndex) {
|
||||
return event.getX(pointerIndex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId) {
|
||||
return velocityTracker.getXVelocity(pointerId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMeasuredSize(View view) {
|
||||
return view.getMeasuredWidth();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimaryScroll(View view) {
|
||||
return view.getScrollX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryScale(View view) {
|
||||
return view.getScaleX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMaxScroll(AccessibilityEvent event, int maxScroll) {
|
||||
event.setMaxScrollX(maxScroll);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getRecentsRtlSetting(Resources resources) {
|
||||
return !Utilities.isRtl(resources);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getChildStart(View view) {
|
||||
return view.getLeft();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCenterForPage(View view, Rect insets) {
|
||||
return (view.getPaddingTop() + view.getMeasuredHeight() + insets.top
|
||||
- insets.bottom - view.getPaddingBottom()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetStart(View view, Rect insets) {
|
||||
return insets.left + view.getPaddingLeft();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetEnd(View view, Rect insets) {
|
||||
return view.getWidth() - view.getPaddingRight() - insets.right;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChildBounds getChildBounds(View child, int childStart, int pageCenter,
|
||||
boolean layoutChild) {
|
||||
final int childWidth = child.getMeasuredWidth();
|
||||
final int childRight = childStart + childWidth;
|
||||
final int childHeight = child.getMeasuredHeight();
|
||||
final int childTop = pageCenter - childHeight / 2;
|
||||
if (layoutChild) {
|
||||
child.layout(childStart, childTop, childRight, childTop + childHeight);
|
||||
}
|
||||
return new ChildBounds(childWidth, childHeight, childRight, childTop);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,681 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.touch;
|
||||
|
||||
import static android.view.Gravity.BOTTOM;
|
||||
import static android.view.Gravity.CENTER_VERTICAL;
|
||||
import static android.view.Gravity.END;
|
||||
import static android.view.Gravity.LEFT;
|
||||
import static android.view.Gravity.START;
|
||||
import static android.view.Gravity.TOP;
|
||||
import static android.view.View.LAYOUT_DIRECTION_RTL;
|
||||
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
|
||||
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
|
||||
import static com.android.launcher3.Flags.enableOverviewIconMenu;
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
|
||||
import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.drawable.ShapeDrawable;
|
||||
import android.util.FloatProperty;
|
||||
import android.util.Pair;
|
||||
import android.view.Gravity;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.Surface;
|
||||
import android.view.VelocityTracker;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
|
||||
import com.android.launcher3.views.BaseDragLayer;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class LandscapePagedViewHandler implements PagedOrientationHandler {
|
||||
|
||||
@Override
|
||||
public <T> T getPrimaryValue(T x, T y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getSecondaryValue(T x, T y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimaryValue(int x, int y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryValue(int x, int y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryValue(float x, float y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSecondaryValue(float x, float y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isLayoutNaturalToLauncher() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void adjustFloatingIconStartVelocity(PointF velocity) {
|
||||
float oldX = velocity.x;
|
||||
float oldY = velocity.y;
|
||||
velocity.set(-oldY, oldX);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fixBoundsForHomeAnimStartRect(RectF outStartRect, DeviceProfile deviceProfile) {
|
||||
// We don't need to check the "top" value here because the startRect is in the orientation
|
||||
// of the app, not of the fixed portrait launcher.
|
||||
if (outStartRect.left > deviceProfile.heightPx) {
|
||||
outStartRect.offsetTo(0, outStartRect.top);
|
||||
} else if (outStartRect.left < -deviceProfile.heightPx) {
|
||||
outStartRect.offsetTo(0, outStartRect.top);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Int2DAction<T> action, int param) {
|
||||
action.call(target, 0, param);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Float2DAction<T> action, float param) {
|
||||
action.call(target, 0, param);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setSecondary(T target, Float2DAction<T> action, float param) {
|
||||
action.call(target, param, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void set(T target, Int2DAction<T> action, int primaryParam,
|
||||
int secondaryParam) {
|
||||
action.call(target, secondaryParam, primaryParam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryDirection(MotionEvent event, int pointerIndex) {
|
||||
return event.getY(pointerIndex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId) {
|
||||
return velocityTracker.getYVelocity(pointerId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMeasuredSize(View view) {
|
||||
return view.getMeasuredHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimarySize(View view) {
|
||||
return view.getHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimarySize(RectF rect) {
|
||||
return rect.height();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStart(RectF rect) {
|
||||
return rect.top;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getEnd(RectF rect) {
|
||||
return rect.bottom;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getClearAllSidePadding(View view, boolean isRtl) {
|
||||
return (isRtl ? view.getPaddingBottom() : - view.getPaddingTop()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryDimension(View view) {
|
||||
return view.getWidth();
|
||||
}
|
||||
|
||||
@Override
|
||||
public FloatProperty<View> getPrimaryViewTranslate() {
|
||||
return VIEW_TRANSLATE_Y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FloatProperty<View> getSecondaryViewTranslate() {
|
||||
return VIEW_TRANSLATE_X;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimaryScroll(View view) {
|
||||
return view.getScrollY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryScale(View view) {
|
||||
return view.getScaleY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMaxScroll(AccessibilityEvent event, int maxScroll) {
|
||||
event.setMaxScrollY(maxScroll);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getRecentsRtlSetting(Resources resources) {
|
||||
return !Utilities.isRtl(resources);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDegreesRotated() {
|
||||
return 90;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRotation() {
|
||||
return Surface.ROTATION_90;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPrimaryScale(View view, float scale) {
|
||||
view.setScaleY(scale);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSecondaryScale(View view, float scale) {
|
||||
view.setScaleX(scale);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getChildStart(View view) {
|
||||
return view.getTop();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCenterForPage(View view, Rect insets) {
|
||||
return (view.getPaddingLeft() + view.getMeasuredWidth() + insets.left
|
||||
- insets.right - view.getPaddingRight()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetStart(View view, Rect insets) {
|
||||
return insets.top + view.getPaddingTop();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetEnd(View view, Rect insets) {
|
||||
return view.getHeight() - view.getPaddingBottom() - insets.bottom;
|
||||
}
|
||||
|
||||
public int getSecondaryTranslationDirectionFactor() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSplitTranslationDirectionFactor(int stagePosition, DeviceProfile deviceProfile) {
|
||||
if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
|
||||
return -1;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuX(float x, View thumbnailView,
|
||||
DeviceProfile deviceProfile, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return x + (taskInsetMargin / 2f);
|
||||
}
|
||||
return thumbnailView.getMeasuredWidth() + x - taskInsetMargin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuY(float y, View thumbnailView, int stagePosition,
|
||||
View taskMenuView, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return y - (thumbnailView.getLayoutDirection() == LAYOUT_DIRECTION_RTL
|
||||
? taskMenuView.getMeasuredHeight() * 2 - (taskInsetMargin / 2f)
|
||||
: taskMenuView.getMeasuredHeight());
|
||||
|
||||
}
|
||||
BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) taskMenuView.getLayoutParams();
|
||||
int taskMenuWidth = lp.width;
|
||||
if (stagePosition == STAGE_POSITION_UNDEFINED) {
|
||||
return y + taskInsetMargin
|
||||
+ (thumbnailView.getMeasuredHeight() - taskMenuWidth) / 2f;
|
||||
} else {
|
||||
return y + taskInsetMargin;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile,
|
||||
@StagePosition int stagePosition) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return thumbnailView.getResources().getDimensionPixelSize(
|
||||
R.dimen.task_thumbnail_icon_menu_max_width);
|
||||
}
|
||||
if (stagePosition == SplitConfigurationOptions.STAGE_POSITION_UNDEFINED) {
|
||||
return thumbnailView.getMeasuredWidth();
|
||||
} else {
|
||||
return thumbnailView.getMeasuredHeight();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
|
||||
LinearLayout taskMenuLayout, int dividerSpacing,
|
||||
ShapeDrawable dividerDrawable) {
|
||||
taskMenuLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
dividerDrawable.setIntrinsicHeight(dividerSpacing);
|
||||
taskMenuLayout.setDividerDrawable(dividerDrawable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
|
||||
LinearLayout viewGroup, DeviceProfile deviceProfile) {
|
||||
// Phone fake landscape
|
||||
viewGroup.setOrientation(LinearLayout.HORIZONTAL);
|
||||
lp.width = MATCH_PARENT;
|
||||
lp.height = WRAP_CONTENT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Pair<Float, Float> getDwbLayoutTranslations(int taskViewWidth,
|
||||
int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile,
|
||||
View[] thumbnailViews, int desiredTaskId, View banner) {
|
||||
boolean isRtl = banner.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
|
||||
float translationX = 0;
|
||||
float translationY = 0;
|
||||
FrameLayout.LayoutParams bannerParams = (FrameLayout.LayoutParams) banner.getLayoutParams();
|
||||
banner.setPivotX(0);
|
||||
banner.setPivotY(0);
|
||||
banner.setRotation(getDegreesRotated());
|
||||
translationX = banner.getHeight();
|
||||
FrameLayout.LayoutParams snapshotParams =
|
||||
(FrameLayout.LayoutParams) thumbnailViews[0]
|
||||
.getLayoutParams();
|
||||
bannerParams.gravity = TOP | (isRtl ? END : START);
|
||||
if (splitBounds == null) {
|
||||
// Single, fullscreen case
|
||||
bannerParams.width = taskViewHeight - snapshotParams.topMargin;
|
||||
return new Pair<>(translationX, Integer.valueOf(snapshotParams.topMargin).floatValue());
|
||||
}
|
||||
|
||||
// Set correct width
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
bannerParams.width = thumbnailViews[0].getMeasuredHeight();
|
||||
} else {
|
||||
bannerParams.width = thumbnailViews[1].getMeasuredHeight();
|
||||
}
|
||||
|
||||
// Set translations
|
||||
if (desiredTaskId == splitBounds.rightBottomTaskId) {
|
||||
float topLeftTaskPlusDividerPercent = splitBounds.appsStackedVertically
|
||||
? (splitBounds.topTaskPercent + splitBounds.dividerHeightPercent)
|
||||
: (splitBounds.leftTaskPercent + splitBounds.dividerWidthPercent);
|
||||
translationY = snapshotParams.topMargin
|
||||
+ ((taskViewHeight - snapshotParams.topMargin) * topLeftTaskPlusDividerPercent);
|
||||
}
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
translationY = snapshotParams.topMargin;
|
||||
}
|
||||
return new Pair<>(translationX, translationY);
|
||||
}
|
||||
|
||||
/* ---------- The following are only used by TaskViewTouchHandler. ---------- */
|
||||
|
||||
@Override
|
||||
public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
|
||||
return HORIZONTAL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUpDirection(boolean isRtl) {
|
||||
return isRtl ? SingleAxisSwipeDetector.DIRECTION_NEGATIVE
|
||||
: SingleAxisSwipeDetector.DIRECTION_POSITIVE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGoingUp(float displacement, boolean isRtl) {
|
||||
return isRtl ? displacement < 0 : displacement > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTaskDragDisplacementFactor(boolean isRtl) {
|
||||
return isRtl ? 1 : -1;
|
||||
}
|
||||
|
||||
/* -------------------- */
|
||||
|
||||
@Override
|
||||
public ChildBounds getChildBounds(View child, int childStart, int pageCenter,
|
||||
boolean layoutChild) {
|
||||
final int childHeight = child.getMeasuredHeight();
|
||||
final int childBottom = childStart + childHeight;
|
||||
final int childWidth = child.getMeasuredWidth();
|
||||
final int childLeft = pageCenter - childWidth/ 2;
|
||||
if (layoutChild) {
|
||||
child.layout(childLeft, childStart, childLeft + childWidth, childBottom);
|
||||
}
|
||||
return new ChildBounds(childHeight, childWidth, childBottom, childLeft);
|
||||
}
|
||||
|
||||
@SuppressWarnings("SuspiciousNameCombination")
|
||||
@Override
|
||||
public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
|
||||
return rect.left;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
|
||||
// Add "left" side of phone which is actually the top
|
||||
return Collections.singletonList(new SplitPositionOption(
|
||||
R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen,
|
||||
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getInitialSplitPlaceholderBounds(int placeholderHeight, int placeholderInset,
|
||||
DeviceProfile dp, @StagePosition int stagePosition, Rect out) {
|
||||
// In fake land/seascape, the placeholder always needs to go to the "top" of the device,
|
||||
// which is the same bounds as 0 rotation.
|
||||
int width = dp.widthPx;
|
||||
int insetSizeAdjustment = getPlaceholderSizeAdjustment(dp);
|
||||
out.set(0, 0, width, placeholderHeight + insetSizeAdjustment);
|
||||
out.inset(placeholderInset, 0);
|
||||
|
||||
// Adjust the top to account for content off screen. This will help to animate the view in
|
||||
// with rounded corners.
|
||||
int screenWidth = dp.widthPx;
|
||||
int screenHeight = dp.heightPx;
|
||||
int totalHeight = (int) (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset)
|
||||
/ screenWidth);
|
||||
out.top -= (totalHeight - placeholderHeight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSplitIconParams(View out, float onScreenRectCenterX,
|
||||
float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY,
|
||||
int drawableWidth, int drawableHeight, DeviceProfile dp,
|
||||
@StagePosition int stagePosition) {
|
||||
float insetAdjustment = getPlaceholderSizeAdjustment(dp) / 2f;
|
||||
out.setX(onScreenRectCenterX / fullscreenScaleX
|
||||
- 1.0f * drawableWidth / 2);
|
||||
out.setY((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY
|
||||
- 1.0f * drawableHeight / 2);
|
||||
}
|
||||
|
||||
/**
|
||||
* The split placeholder comes with a default inset to buffer the icon from the top of the
|
||||
* screen. But if the device already has a large inset (from cutouts etc), use that instead.
|
||||
*/
|
||||
private int getPlaceholderSizeAdjustment(DeviceProfile dp) {
|
||||
return Math.max(dp.getInsets().top - dp.splitPlaceholderInset, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight,
|
||||
int splitInstructionsWidth) {
|
||||
out.setPivotX(0);
|
||||
out.setPivotY(splitInstructionsHeight);
|
||||
out.setRotation(getDegreesRotated());
|
||||
int distanceToEdge = out.getResources().getDimensionPixelSize(
|
||||
R.dimen.split_instructions_bottom_margin_phone_landscape);
|
||||
// Adjust for any insets on the left edge
|
||||
int insetCorrectionX = dp.getInsets().left;
|
||||
// Center the view in case of unbalanced insets on top or bottom of screen
|
||||
int insetCorrectionY = (dp.getInsets().bottom - dp.getInsets().top) / 2;
|
||||
out.setTranslationX(distanceToEdge - insetCorrectionX);
|
||||
out.setTranslationY(((-splitInstructionsHeight - splitInstructionsWidth) / 2f)
|
||||
+ insetCorrectionY);
|
||||
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) out.getLayoutParams();
|
||||
// Setting gravity to LEFT instead of the lint-recommended START because we always want this
|
||||
// view to be screen-left when phone is in landscape, regardless of the RtL setting.
|
||||
lp.gravity = LEFT | CENTER_VERTICAL;
|
||||
out.setLayoutParams(lp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getFinalSplitPlaceholderBounds(int splitDividerSize, DeviceProfile dp,
|
||||
@StagePosition int stagePosition, Rect out1, Rect out2) {
|
||||
// In fake land/seascape, the window bounds are always top and bottom half
|
||||
int screenHeight = dp.heightPx;
|
||||
int screenWidth = dp.widthPx;
|
||||
out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize);
|
||||
out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect,
|
||||
SplitBounds splitInfo, int desiredStagePosition) {
|
||||
float topLeftTaskPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.topTaskPercent
|
||||
: splitInfo.leftTaskPercent;
|
||||
float dividerBarPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.dividerHeightPercent
|
||||
: splitInfo.dividerWidthPercent;
|
||||
|
||||
if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) {
|
||||
outRect.bottom = outRect.top + (int) (outRect.height() * topLeftTaskPercent);
|
||||
} else {
|
||||
outRect.top += (int) (outRect.height() * (topLeftTaskPercent + dividerBarPercent));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,
|
||||
int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, DeviceProfile dp,
|
||||
boolean isRtl) {
|
||||
FrameLayout.LayoutParams primaryParams =
|
||||
(FrameLayout.LayoutParams) primarySnapshot.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryParams =
|
||||
(FrameLayout.LayoutParams) secondarySnapshot.getLayoutParams();
|
||||
|
||||
// Swap the margins that are set in TaskView#setRecentsOrientedState()
|
||||
secondaryParams.topMargin = dp.overviewTaskThumbnailTopMarginPx;
|
||||
primaryParams.topMargin = 0;
|
||||
|
||||
// Measure and layout the thumbnails bottom up, since the primary is on the visual left
|
||||
// (portrait bottom) and secondary is on the right (portrait top)
|
||||
int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;
|
||||
int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;
|
||||
int dividerBar = Math.round(totalThumbnailHeight * (splitBoundsConfig.appsStackedVertically
|
||||
? splitBoundsConfig.dividerHeightPercent
|
||||
: splitBoundsConfig.dividerWidthPercent));
|
||||
int primarySnapshotHeight;
|
||||
int primarySnapshotWidth;
|
||||
int secondarySnapshotHeight;
|
||||
int secondarySnapshotWidth;
|
||||
|
||||
float taskPercent = splitBoundsConfig.appsStackedVertically ?
|
||||
splitBoundsConfig.topTaskPercent : splitBoundsConfig.leftTaskPercent;
|
||||
primarySnapshotWidth = parentWidth;
|
||||
primarySnapshotHeight = (int) (totalThumbnailHeight * (taskPercent));
|
||||
|
||||
secondarySnapshotWidth = parentWidth;
|
||||
secondarySnapshotHeight = totalThumbnailHeight - primarySnapshotHeight - dividerBar;
|
||||
|
||||
int translationY = primarySnapshotHeight + spaceAboveSnapshot + dividerBar;
|
||||
primarySnapshot.setTranslationY(spaceAboveSnapshot);
|
||||
secondarySnapshot.setTranslationY(translationY - spaceAboveSnapshot);
|
||||
|
||||
primarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotHeight, View.MeasureSpec.EXACTLY)
|
||||
);
|
||||
secondarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotHeight, View.MeasureSpec.EXACTLY)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTaskIconParams(FrameLayout.LayoutParams iconParams, int taskIconMargin,
|
||||
int taskIconHeight, int thumbnailTopMargin, boolean isRtl) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
iconParams.gravity = Gravity.START | Gravity.CENTER_VERTICAL;
|
||||
iconParams.topMargin = 0;
|
||||
return;
|
||||
}
|
||||
iconParams.gravity = (isRtl ? START : END) | CENTER_VERTICAL;
|
||||
iconParams.rightMargin = -taskIconHeight - taskIconMargin / 2;
|
||||
iconParams.leftMargin = 0;
|
||||
iconParams.topMargin = thumbnailTopMargin / 2;
|
||||
iconParams.bottomMargin = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setIconAppChipMenuParams(View iconAppChipMenuView,
|
||||
FrameLayout.LayoutParams iconMenuParams, int iconMenuMargin, int thumbnailTopMargin) {
|
||||
boolean isRtl = iconAppChipMenuView.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
|
||||
iconMenuParams.gravity = (isRtl ? START : END) | (isRtl ? BOTTOM : TOP);
|
||||
iconMenuParams.setMarginStart(isRtl ? iconMenuMargin : 0);
|
||||
iconMenuParams.topMargin = iconMenuMargin;
|
||||
iconMenuParams.bottomMargin = isRtl ? iconMenuMargin : 0;
|
||||
iconMenuParams.setMarginEnd(iconMenuMargin);
|
||||
|
||||
iconAppChipMenuView.setPivotX(isRtl ? iconMenuParams.width - (iconMenuParams.height / 2f)
|
||||
: iconMenuParams.width / 2f);
|
||||
iconAppChipMenuView.setPivotY(
|
||||
isRtl ? (iconMenuParams.height / 2f) : iconMenuParams.width / 2f);
|
||||
iconAppChipMenuView.setTranslationY(0);
|
||||
iconAppChipMenuView.setRotation(getDegreesRotated());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitIconParams(View primaryIconView, View secondaryIconView,
|
||||
int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight,
|
||||
int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl,
|
||||
DeviceProfile deviceProfile, SplitBounds splitConfig) {
|
||||
FrameLayout.LayoutParams primaryIconParams =
|
||||
(FrameLayout.LayoutParams) primaryIconView.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryIconParams = enableOverviewIconMenu()
|
||||
? (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams()
|
||||
: new FrameLayout.LayoutParams(primaryIconParams);
|
||||
|
||||
// We calculate the "midpoint" of the thumbnail area, and place the icons there.
|
||||
// This is the place where the thumbnail area splits by default, in a near-50/50 split.
|
||||
// It is usually not exactly 50/50, due to insets/screen cutouts.
|
||||
int fullscreenInsetThickness = deviceProfile.getInsets().top
|
||||
- deviceProfile.getInsets().bottom;
|
||||
int fullscreenMidpointFromBottom = ((deviceProfile.heightPx - fullscreenInsetThickness)
|
||||
/ 2);
|
||||
float midpointFromBottomPct = (float) fullscreenMidpointFromBottom / deviceProfile.heightPx;
|
||||
float insetPct = (float) fullscreenInsetThickness / deviceProfile.heightPx;
|
||||
int spaceAboveSnapshots = deviceProfile.overviewTaskThumbnailTopMarginPx;
|
||||
int overviewThumbnailAreaThickness = groupedTaskViewHeight - spaceAboveSnapshots;
|
||||
int bottomToMidpointOffset = (int) (overviewThumbnailAreaThickness * midpointFromBottomPct);
|
||||
int insetOffset = (int) (overviewThumbnailAreaThickness * insetPct);
|
||||
|
||||
if (enableOverviewIconMenu()) {
|
||||
primaryIconParams.gravity = isRtl ? BOTTOM | START : TOP | END;
|
||||
secondaryIconParams.gravity = isRtl ? BOTTOM | START : TOP | END;
|
||||
} else {
|
||||
primaryIconParams.gravity = BOTTOM | (isRtl ? START : END);
|
||||
secondaryIconParams.gravity = BOTTOM | (isRtl ? START : END);
|
||||
}
|
||||
primaryIconView.setTranslationX(0);
|
||||
secondaryIconView.setTranslationX(0);
|
||||
if (enableOverviewIconMenu()) {
|
||||
if (primaryIconView.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
|
||||
secondaryIconView.setTranslationY(-primarySnapshotHeight);
|
||||
primaryIconView.setTranslationY(0);
|
||||
} else {
|
||||
int secondarySnapshotHeight = groupedTaskViewHeight - primarySnapshotHeight;
|
||||
primaryIconView.setTranslationY(secondarySnapshotHeight);
|
||||
}
|
||||
} else if (splitConfig.initiatedFromSeascape) {
|
||||
// if the split was initiated from seascape,
|
||||
// the task on the right (secondary) is slightly larger
|
||||
primaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset);
|
||||
secondaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset
|
||||
+ taskIconHeight);
|
||||
} else {
|
||||
// if not,
|
||||
// the task on the left (primary) is slightly larger
|
||||
primaryIconView.setTranslationY(-bottomToMidpointOffset);
|
||||
secondaryIconView.setTranslationY(-bottomToMidpointOffset + taskIconHeight);
|
||||
}
|
||||
|
||||
primaryIconView.setLayoutParams(primaryIconParams);
|
||||
secondaryIconView.setLayoutParams(secondaryIconParams);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDefaultSplitPosition(DeviceProfile deviceProfile) {
|
||||
throw new IllegalStateException("Default position not available in fake landscape");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Pair<FloatProperty, FloatProperty> getSplitSelectTaskOffset(FloatProperty primary,
|
||||
FloatProperty secondary, DeviceProfile deviceProfile) {
|
||||
return new Pair<>(primary, secondary);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getFloatingTaskOffscreenTranslationTarget(View floatingTask, RectF onScreenRect,
|
||||
@StagePosition int stagePosition, DeviceProfile dp) {
|
||||
float currentTranslationY = floatingTask.getTranslationY();
|
||||
return currentTranslationY - onScreenRect.height();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFloatingTaskPrimaryTranslation(View floatingTask, float translation,
|
||||
DeviceProfile dp) {
|
||||
floatingTask.setTranslationY(translation);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) {
|
||||
return floatingTask.getTranslationY();
|
||||
}
|
||||
}
|
||||
@@ -19,26 +19,11 @@ package com.android.launcher3.touch;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Matrix;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.drawable.ShapeDrawable;
|
||||
import android.util.FloatProperty;
|
||||
import android.util.Pair;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.VelocityTracker;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Abstraction layer to separate horizontal and vertical specific implementations
|
||||
@@ -47,9 +32,7 @@ import java.util.List;
|
||||
*/
|
||||
public interface PagedOrientationHandler {
|
||||
|
||||
PagedOrientationHandler PORTRAIT = new PortraitPagedViewHandler();
|
||||
PagedOrientationHandler LANDSCAPE = new LandscapePagedViewHandler();
|
||||
PagedOrientationHandler SEASCAPE = new SeascapePagedViewHandler();
|
||||
PagedOrientationHandler DEFAULT = new DefaultPagedViewHandler();
|
||||
|
||||
interface Int2DAction<T> {
|
||||
void call(T target, int x, int y);
|
||||
@@ -64,39 +47,18 @@ public interface PagedOrientationHandler {
|
||||
|
||||
<T> void setPrimary(T target, Int2DAction<T> action, int param);
|
||||
<T> void setPrimary(T target, Float2DAction<T> action, float param);
|
||||
<T> void setSecondary(T target, Float2DAction<T> action, float param);
|
||||
<T> void set(T target, Int2DAction<T> action, int primaryParam, int secondaryParam);
|
||||
float getPrimaryDirection(MotionEvent event, int pointerIndex);
|
||||
float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId);
|
||||
int getMeasuredSize(View view);
|
||||
int getPrimarySize(View view);
|
||||
float getPrimarySize(RectF rect);
|
||||
float getStart(RectF rect);
|
||||
float getEnd(RectF rect);
|
||||
int getClearAllSidePadding(View view, boolean isRtl);
|
||||
int getSecondaryDimension(View view);
|
||||
FloatProperty<View> getPrimaryViewTranslate();
|
||||
FloatProperty<View> getSecondaryViewTranslate();
|
||||
|
||||
int getPrimaryScroll(View view);
|
||||
float getPrimaryScale(View view);
|
||||
int getChildStart(View view);
|
||||
int getCenterForPage(View view, Rect insets);
|
||||
int getScrollOffsetStart(View view, Rect insets);
|
||||
int getScrollOffsetEnd(View view, Rect insets);
|
||||
int getSecondaryTranslationDirectionFactor();
|
||||
int getSplitTranslationDirectionFactor(@StagePosition int stagePosition,
|
||||
DeviceProfile deviceProfile);
|
||||
ChildBounds getChildBounds(View child, int childStart, int pageCenter, boolean layoutChild);
|
||||
void setMaxScroll(AccessibilityEvent event, int maxScroll);
|
||||
boolean getRecentsRtlSetting(Resources resources);
|
||||
float getDegreesRotated();
|
||||
int getRotation();
|
||||
void setPrimaryScale(View view, float scale);
|
||||
void setSecondaryScale(View view, float scale);
|
||||
|
||||
<T> T getPrimaryValue(T x, T y);
|
||||
<T> T getSecondaryValue(T x, T y);
|
||||
|
||||
int getPrimaryValue(int x, int y);
|
||||
int getSecondaryValue(int x, int y);
|
||||
@@ -104,174 +66,6 @@ public interface PagedOrientationHandler {
|
||||
float getPrimaryValue(float x, float y);
|
||||
float getSecondaryValue(float x, float y);
|
||||
|
||||
boolean isLayoutNaturalToLauncher();
|
||||
Pair<FloatProperty, FloatProperty> getSplitSelectTaskOffset(FloatProperty primary,
|
||||
FloatProperty secondary, DeviceProfile deviceProfile);
|
||||
int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect);
|
||||
List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp);
|
||||
/**
|
||||
* @param placeholderHeight height of placeholder view in portrait, width in landscape
|
||||
*/
|
||||
void getInitialSplitPlaceholderBounds(int placeholderHeight, int placeholderInset,
|
||||
DeviceProfile dp, @StagePosition int stagePosition, Rect out);
|
||||
|
||||
/**
|
||||
* Centers an icon in the split staging area, accounting for insets.
|
||||
* @param out The icon that needs to be centered.
|
||||
* @param onScreenRectCenterX The x-center of the on-screen staging area (most of the Rect is
|
||||
* offscreen).
|
||||
* @param onScreenRectCenterY The y-center of the on-screen staging area (most of the Rect is
|
||||
* offscreen).
|
||||
* @param fullscreenScaleX A x-scaling factor used to convert coordinates back into pixels.
|
||||
* @param fullscreenScaleY A y-scaling factor used to convert coordinates back into pixels.
|
||||
* @param drawableWidth The icon's drawable (final) width.
|
||||
* @param drawableHeight The icon's drawable (final) height.
|
||||
* @param dp The device profile, used to report rotation and hardware insets.
|
||||
* @param stagePosition 0 if the staging area is pinned to top/left, 1 for bottom/right.
|
||||
*/
|
||||
void updateSplitIconParams(View out, float onScreenRectCenterX,
|
||||
float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY,
|
||||
int drawableWidth, int drawableHeight, DeviceProfile dp,
|
||||
@StagePosition int stagePosition);
|
||||
|
||||
/**
|
||||
* Sets positioning and rotation for a SplitInstructionsView.
|
||||
* @param out The SplitInstructionsView that needs to be positioned.
|
||||
* @param dp The device profile, used to report rotation and device type.
|
||||
* @param splitInstructionsHeight The SplitInstructionView's height.
|
||||
* @param splitInstructionsWidth The SplitInstructionView's width.
|
||||
*/
|
||||
void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight,
|
||||
int splitInstructionsWidth);
|
||||
|
||||
/**
|
||||
* @param splitDividerSize height of split screen drag handle in portrait, width in landscape
|
||||
* @param stagePosition the split position option (top/left, bottom/right) of the first
|
||||
* task selected for entering split
|
||||
* @param out1 the bounds for where the first selected app will be
|
||||
* @param out2 the bounds for where the second selected app will be, complimentary to
|
||||
* {@param out1} based on {@param initialSplitOption}
|
||||
*/
|
||||
void getFinalSplitPlaceholderBounds(int splitDividerSize, DeviceProfile dp,
|
||||
@StagePosition int stagePosition, Rect out1, Rect out2);
|
||||
|
||||
int getDefaultSplitPosition(DeviceProfile deviceProfile);
|
||||
|
||||
/**
|
||||
* @param outRect This is expected to be the rect that has the dimensions for a non-split,
|
||||
* fullscreen task in overview. This will directly be modified.
|
||||
* @param desiredStagePosition Which stage position (topLeft/rightBottom) we want to resize
|
||||
* outRect for
|
||||
*/
|
||||
void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, SplitBounds splitInfo,
|
||||
@SplitConfigurationOptions.StagePosition int desiredStagePosition);
|
||||
|
||||
void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,
|
||||
int parentWidth, int parentHeight,
|
||||
SplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl);
|
||||
|
||||
// Overview TaskMenuView methods
|
||||
void setTaskIconParams(FrameLayout.LayoutParams iconParams,
|
||||
int taskIconMargin, int taskIconHeight, int thumbnailTopMargin, boolean isRtl);
|
||||
void setIconAppChipMenuParams(View iconAppChipMenuView, FrameLayout.LayoutParams iconMenuParams,
|
||||
int iconMenuMargin, int thumbnailTopMargin);
|
||||
void setSplitIconParams(View primaryIconView, View secondaryIconView,
|
||||
int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight,
|
||||
int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl,
|
||||
DeviceProfile deviceProfile, SplitBounds splitConfig);
|
||||
|
||||
/*
|
||||
* The following two methods try to center the TaskMenuView in landscape by finding the center
|
||||
* of the thumbnail view and then subtracting half of the taskMenu width. In this case, the
|
||||
* taskMenu width is the same size as the thumbnail width (what got set below in
|
||||
* getTaskMenuWidth()), so we directly use that in the calculations.
|
||||
*/
|
||||
float getTaskMenuX(float x, View thumbnailView, DeviceProfile deviceProfile,
|
||||
float taskInsetMargin, View taskViewIcon);
|
||||
float getTaskMenuY(float y, View thumbnailView, int stagePosition,
|
||||
View taskMenuView, float taskInsetMargin, View taskViewIcon);
|
||||
int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile,
|
||||
@StagePosition int stagePosition);
|
||||
/**
|
||||
* Sets linear layout orientation for {@link com.android.launcher3.popup.SystemShortcut} items
|
||||
* inside task menu view.
|
||||
*/
|
||||
void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
|
||||
LinearLayout taskMenuLayout, int dividerSpacing,
|
||||
ShapeDrawable dividerDrawable);
|
||||
/**
|
||||
* Sets layout param attributes for {@link com.android.launcher3.popup.SystemShortcut} child
|
||||
* views inside task menu view.
|
||||
*/
|
||||
void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
|
||||
LinearLayout viewGroup, DeviceProfile deviceProfile);
|
||||
|
||||
/**
|
||||
* Calculates the position where a Digital Wellbeing Banner should be placed on its parent
|
||||
* TaskView.
|
||||
* @return A Pair of Floats representing the proper x and y translations.
|
||||
*/
|
||||
Pair<Float, Float> getDwbLayoutTranslations(int taskViewWidth,
|
||||
int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile,
|
||||
View[] thumbnailViews, int desiredTaskId, View banner);
|
||||
|
||||
// The following are only used by TaskViewTouchHandler.
|
||||
/** @return Either VERTICAL or HORIZONTAL. */
|
||||
SingleAxisSwipeDetector.Direction getUpDownSwipeDirection();
|
||||
/** @return Given {@link #getUpDownSwipeDirection()}, whether POSITIVE or NEGATIVE is up. */
|
||||
int getUpDirection(boolean isRtl);
|
||||
/** @return Whether the displacement is going towards the top of the screen. */
|
||||
boolean isGoingUp(float displacement, boolean isRtl);
|
||||
/** @return Either 1 or -1, a factor to multiply by so the animation goes the correct way. */
|
||||
int getTaskDragDisplacementFactor(boolean isRtl);
|
||||
|
||||
/**
|
||||
* Maps the velocity from the coordinate plane of the foreground app to that
|
||||
* of Launcher's (which now will always be portrait)
|
||||
*/
|
||||
void adjustFloatingIconStartVelocity(PointF velocity);
|
||||
|
||||
/**
|
||||
* Ensures that outStartRect left bound is within the DeviceProfile's visual boundaries
|
||||
* @param outStartRect The start rect that will directly be modified
|
||||
*/
|
||||
void fixBoundsForHomeAnimStartRect(RectF outStartRect, DeviceProfile deviceProfile);
|
||||
|
||||
/**
|
||||
* Determine the target translation for animating the FloatingTaskView out. This value could
|
||||
* either be an x-coordinate or a y-coordinate, depending on which way the FloatingTaskView was
|
||||
* docked.
|
||||
*
|
||||
* @param floatingTask The FloatingTaskView.
|
||||
* @param onScreenRect The current on-screen dimensions of the FloatingTaskView.
|
||||
* @param stagePosition STAGE_POSITION_TOP_OR_LEFT or STAGE_POSITION_BOTTOM_OR_RIGHT.
|
||||
* @param dp The device profile.
|
||||
* @return A float. When an animation translates the FloatingTaskView to this position, it will
|
||||
* appear to tuck away off the edge of the screen.
|
||||
*/
|
||||
float getFloatingTaskOffscreenTranslationTarget(View floatingTask, RectF onScreenRect,
|
||||
@StagePosition int stagePosition, DeviceProfile dp);
|
||||
|
||||
/**
|
||||
* Sets the translation of a FloatingTaskView along its "slide-in/slide-out" axis (could be
|
||||
* either x or y), depending on how the view is oriented.
|
||||
*
|
||||
* @param floatingTask The FloatingTaskView to be translated.
|
||||
* @param translation The target translation value.
|
||||
* @param dp The current device profile.
|
||||
*/
|
||||
void setFloatingTaskPrimaryTranslation(View floatingTask, float translation, DeviceProfile dp);
|
||||
|
||||
/**
|
||||
* Gets the translation of a FloatingTaskView along its "slide-in/slide-out" axis (could be
|
||||
* either x or y), depending on how the view is oriented.
|
||||
*
|
||||
* @param floatingTask The FloatingTaskView in question.
|
||||
* @param dp The current device profile.
|
||||
* @return The current translation value.
|
||||
*/
|
||||
Float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp);
|
||||
|
||||
class ChildBounds {
|
||||
|
||||
public final int primaryDimension;
|
||||
@@ -279,8 +73,8 @@ public interface PagedOrientationHandler {
|
||||
public final int childPrimaryEnd;
|
||||
public final int childSecondaryEnd;
|
||||
|
||||
ChildBounds(int primaryDimension, int secondaryDimension, int childPrimaryEnd,
|
||||
int childSecondaryEnd) {
|
||||
public ChildBounds(int primaryDimension, int secondaryDimension, int childPrimaryEnd,
|
||||
int childSecondaryEnd) {
|
||||
this.primaryDimension = primaryDimension;
|
||||
this.secondaryDimension = secondaryDimension;
|
||||
this.childPrimaryEnd = childPrimaryEnd;
|
||||
|
||||
@@ -1,879 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.touch;
|
||||
|
||||
import static android.view.Gravity.BOTTOM;
|
||||
import static android.view.Gravity.CENTER_HORIZONTAL;
|
||||
import static android.view.Gravity.END;
|
||||
import static android.view.Gravity.START;
|
||||
import static android.view.Gravity.TOP;
|
||||
import static android.view.View.LAYOUT_DIRECTION_RTL;
|
||||
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
|
||||
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||
|
||||
import static com.android.launcher3.Flags.enableOverviewIconMenu;
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
|
||||
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
|
||||
import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.Matrix;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.graphics.drawable.ShapeDrawable;
|
||||
import android.util.FloatProperty;
|
||||
import android.util.Pair;
|
||||
import android.view.Gravity;
|
||||
import android.view.MotionEvent;
|
||||
import android.view.Surface;
|
||||
import android.view.VelocityTracker;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class PortraitPagedViewHandler implements PagedOrientationHandler {
|
||||
|
||||
private final Matrix mTmpMatrix = new Matrix();
|
||||
private final RectF mTmpRectF = new RectF();
|
||||
|
||||
@Override
|
||||
public <T> T getPrimaryValue(T x, T y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getSecondaryValue(T x, T y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimaryValue(int x, int y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryValue(int x, int y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryValue(float x, float y) {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSecondaryValue(float x, float y) {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isLayoutNaturalToLauncher() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void adjustFloatingIconStartVelocity(PointF velocity) {
|
||||
//no-op
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fixBoundsForHomeAnimStartRect(RectF outStartRect, DeviceProfile deviceProfile) {
|
||||
if (outStartRect.left > deviceProfile.widthPx) {
|
||||
outStartRect.offsetTo(0, outStartRect.top);
|
||||
} else if (outStartRect.left < -deviceProfile.widthPx) {
|
||||
outStartRect.offsetTo(0, outStartRect.top);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Int2DAction<T> action, int param) {
|
||||
action.call(target, param, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setPrimary(T target, Float2DAction<T> action, float param) {
|
||||
action.call(target, param, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void setSecondary(T target, Float2DAction<T> action, float param) {
|
||||
action.call(target, 0, param);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> void set(T target, Int2DAction<T> action, int primaryParam,
|
||||
int secondaryParam) {
|
||||
action.call(target, primaryParam, secondaryParam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryDirection(MotionEvent event, int pointerIndex) {
|
||||
return event.getX(pointerIndex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryVelocity(VelocityTracker velocityTracker, int pointerId) {
|
||||
return velocityTracker.getXVelocity(pointerId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMeasuredSize(View view) {
|
||||
return view.getMeasuredWidth();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimarySize(View view) {
|
||||
return view.getWidth();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimarySize(RectF rect) {
|
||||
return rect.width();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getStart(RectF rect) {
|
||||
return rect.left;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getEnd(RectF rect) {
|
||||
return rect.right;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getClearAllSidePadding(View view, boolean isRtl) {
|
||||
return (isRtl ? view.getPaddingRight() : - view.getPaddingLeft()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSecondaryDimension(View view) {
|
||||
return view.getHeight();
|
||||
}
|
||||
|
||||
@Override
|
||||
public FloatProperty<View> getPrimaryViewTranslate() {
|
||||
return VIEW_TRANSLATE_X;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FloatProperty<View> getSecondaryViewTranslate() {
|
||||
return VIEW_TRANSLATE_Y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPrimaryScroll(View view) {
|
||||
return view.getScrollX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPrimaryScale(View view) {
|
||||
return view.getScaleX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMaxScroll(AccessibilityEvent event, int maxScroll) {
|
||||
event.setMaxScrollX(maxScroll);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getRecentsRtlSetting(Resources resources) {
|
||||
return !Utilities.isRtl(resources);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDegreesRotated() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRotation() {
|
||||
return Surface.ROTATION_0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPrimaryScale(View view, float scale) {
|
||||
view.setScaleX(scale);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSecondaryScale(View view, float scale) {
|
||||
view.setScaleY(scale);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getChildStart(View view) {
|
||||
return view.getLeft();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCenterForPage(View view, Rect insets) {
|
||||
return (view.getPaddingTop() + view.getMeasuredHeight() + insets.top
|
||||
- insets.bottom - view.getPaddingBottom()) / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetStart(View view, Rect insets) {
|
||||
return insets.left + view.getPaddingLeft();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getScrollOffsetEnd(View view, Rect insets) {
|
||||
return view.getWidth() - view.getPaddingRight() - insets.right;
|
||||
}
|
||||
|
||||
public int getSecondaryTranslationDirectionFactor() {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSplitTranslationDirectionFactor(int stagePosition, DeviceProfile deviceProfile) {
|
||||
if (deviceProfile.isLeftRightSplit && stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
|
||||
return -1;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuX(float x, View thumbnailView,
|
||||
DeviceProfile deviceProfile, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
if (thumbnailView.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
|
||||
return x + taskInsetMargin - taskViewIcon.getHeight() - (taskInsetMargin / 2f);
|
||||
}
|
||||
return x + taskInsetMargin;
|
||||
} else if (deviceProfile.isLandscape) {
|
||||
return x + taskInsetMargin
|
||||
+ (thumbnailView.getMeasuredWidth() - thumbnailView.getMeasuredHeight()) / 2f;
|
||||
} else {
|
||||
return x + taskInsetMargin;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuY(float y, View thumbnailView, int stagePosition,
|
||||
View taskMenuView, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return y;
|
||||
}
|
||||
return y + taskInsetMargin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTaskMenuWidth(View thumbnailView, DeviceProfile deviceProfile,
|
||||
@StagePosition int stagePosition) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return thumbnailView.getResources().getDimensionPixelSize(
|
||||
R.dimen.task_thumbnail_icon_menu_max_width);
|
||||
}
|
||||
int padding = thumbnailView.getResources()
|
||||
.getDimensionPixelSize(R.dimen.task_menu_edge_padding);
|
||||
return (deviceProfile.isLandscape && !deviceProfile.isTablet
|
||||
? thumbnailView.getMeasuredHeight()
|
||||
: thumbnailView.getMeasuredWidth()) - (2 * padding);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTaskOptionsMenuLayoutOrientation(DeviceProfile deviceProfile,
|
||||
LinearLayout taskMenuLayout, int dividerSpacing,
|
||||
ShapeDrawable dividerDrawable) {
|
||||
taskMenuLayout.setOrientation(LinearLayout.VERTICAL);
|
||||
dividerDrawable.setIntrinsicHeight(dividerSpacing);
|
||||
taskMenuLayout.setDividerDrawable(dividerDrawable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp,
|
||||
LinearLayout viewGroup, DeviceProfile deviceProfile) {
|
||||
viewGroup.setOrientation(LinearLayout.HORIZONTAL);
|
||||
lp.width = LinearLayout.LayoutParams.MATCH_PARENT;
|
||||
lp.height = WRAP_CONTENT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Pair<Float, Float> getDwbLayoutTranslations(int taskViewWidth,
|
||||
int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile,
|
||||
View[] thumbnailViews, int desiredTaskId, View banner) {
|
||||
float translationX = 0;
|
||||
float translationY = 0;
|
||||
FrameLayout.LayoutParams bannerParams = (FrameLayout.LayoutParams) banner.getLayoutParams();
|
||||
banner.setPivotX(0);
|
||||
banner.setPivotY(0);
|
||||
banner.setRotation(getDegreesRotated());
|
||||
if (splitBounds == null) {
|
||||
// Single, fullscreen case
|
||||
bannerParams.width = MATCH_PARENT;
|
||||
bannerParams.gravity = BOTTOM | CENTER_HORIZONTAL;
|
||||
return new Pair<>(translationX, translationY);
|
||||
}
|
||||
|
||||
bannerParams.gravity = BOTTOM | ((deviceProfile.isLandscape) ? START : CENTER_HORIZONTAL);
|
||||
|
||||
// Set correct width
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
bannerParams.width = thumbnailViews[0].getMeasuredWidth();
|
||||
} else {
|
||||
bannerParams.width = thumbnailViews[1].getMeasuredWidth();
|
||||
}
|
||||
|
||||
// Set translations
|
||||
if (deviceProfile.isLeftRightSplit) {
|
||||
if (desiredTaskId == splitBounds.rightBottomTaskId) {
|
||||
float leftTopTaskPercent = splitBounds.appsStackedVertically
|
||||
? splitBounds.topTaskPercent
|
||||
: splitBounds.leftTaskPercent;
|
||||
float dividerThicknessPercent = splitBounds.appsStackedVertically
|
||||
? splitBounds.dividerHeightPercent
|
||||
: splitBounds.dividerWidthPercent;
|
||||
translationX = ((taskViewWidth * leftTopTaskPercent)
|
||||
+ (taskViewWidth * dividerThicknessPercent));
|
||||
}
|
||||
} else {
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
FrameLayout.LayoutParams snapshotParams =
|
||||
(FrameLayout.LayoutParams) thumbnailViews[0]
|
||||
.getLayoutParams();
|
||||
float bottomRightTaskPlusDividerPercent = splitBounds.appsStackedVertically
|
||||
? (1f - splitBounds.topTaskPercent)
|
||||
: (1f - splitBounds.leftTaskPercent);
|
||||
translationY = -((taskViewHeight - snapshotParams.topMargin)
|
||||
* bottomRightTaskPlusDividerPercent);
|
||||
}
|
||||
}
|
||||
return new Pair<>(translationX, translationY);
|
||||
}
|
||||
|
||||
/* ---------- The following are only used by TaskViewTouchHandler. ---------- */
|
||||
|
||||
@Override
|
||||
public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
|
||||
return VERTICAL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUpDirection(boolean isRtl) {
|
||||
// Ignore rtl since it only affects X value displacement, Y displacement doesn't change
|
||||
return SingleAxisSwipeDetector.DIRECTION_POSITIVE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGoingUp(float displacement, boolean isRtl) {
|
||||
// Ignore rtl since it only affects X value displacement, Y displacement doesn't change
|
||||
return displacement < 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTaskDragDisplacementFactor(boolean isRtl) {
|
||||
// Ignore rtl since it only affects X value displacement, Y displacement doesn't change
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* -------------------- */
|
||||
|
||||
@Override
|
||||
public ChildBounds getChildBounds(View child, int childStart, int pageCenter,
|
||||
boolean layoutChild) {
|
||||
final int childWidth = child.getMeasuredWidth();
|
||||
final int childRight = childStart + childWidth;
|
||||
final int childHeight = child.getMeasuredHeight();
|
||||
final int childTop = pageCenter - childHeight / 2;
|
||||
if (layoutChild) {
|
||||
child.layout(childStart, childTop, childRight, childTop + childHeight);
|
||||
}
|
||||
return new ChildBounds(childWidth, childHeight, childRight, childTop);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
|
||||
return dp.heightPx - rect.bottom;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
|
||||
if (dp.isTablet) {
|
||||
return Utilities.getSplitPositionOptions(dp);
|
||||
}
|
||||
|
||||
List<SplitPositionOption> options = new ArrayList<>();
|
||||
if (dp.isSeascape()) {
|
||||
options.add(new SplitPositionOption(
|
||||
R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen,
|
||||
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
|
||||
} else if (dp.isLeftRightSplit) {
|
||||
options.add(new SplitPositionOption(
|
||||
R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen,
|
||||
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
|
||||
} else {
|
||||
// Only add top option
|
||||
options.add(new SplitPositionOption(
|
||||
R.drawable.ic_split_vertical, R.string.recent_task_option_split_screen,
|
||||
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
|
||||
}
|
||||
return options;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getInitialSplitPlaceholderBounds(int placeholderHeight, int placeholderInset,
|
||||
DeviceProfile dp, @StagePosition int stagePosition, Rect out) {
|
||||
int screenWidth = dp.widthPx;
|
||||
int screenHeight = dp.heightPx;
|
||||
boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
int insetSizeAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight);
|
||||
|
||||
out.set(0, 0, screenWidth, placeholderHeight + insetSizeAdjustment);
|
||||
if (!dp.isLeftRightSplit) {
|
||||
// portrait, phone or tablet - spans width of screen, nothing else to do
|
||||
out.inset(placeholderInset, 0);
|
||||
|
||||
// Adjust the top to account for content off screen. This will help to animate the view
|
||||
// in with rounded corners.
|
||||
int totalHeight = (int) (1.0f * screenHeight / 2 * (screenWidth - 2 * placeholderInset)
|
||||
/ screenWidth);
|
||||
out.top -= (totalHeight - placeholderHeight);
|
||||
return;
|
||||
}
|
||||
|
||||
// Now we rotate the portrait rect depending on what side we want pinned
|
||||
|
||||
float postRotateScale = (float) screenHeight / screenWidth;
|
||||
mTmpMatrix.reset();
|
||||
mTmpMatrix.postRotate(pinToRight ? 90 : 270);
|
||||
mTmpMatrix.postTranslate(pinToRight ? screenWidth : 0, pinToRight ? 0 : screenWidth);
|
||||
// The placeholder height stays constant after rotation, so we don't change width scale
|
||||
mTmpMatrix.postScale(1, postRotateScale);
|
||||
|
||||
mTmpRectF.set(out);
|
||||
mTmpMatrix.mapRect(mTmpRectF);
|
||||
mTmpRectF.inset(0, placeholderInset);
|
||||
mTmpRectF.roundOut(out);
|
||||
|
||||
// Adjust the top to account for content off screen. This will help to animate the view in
|
||||
// with rounded corners.
|
||||
int totalWidth = (int) (1.0f * screenWidth / 2 * (screenHeight - 2 * placeholderInset)
|
||||
/ screenHeight);
|
||||
int width = out.width();
|
||||
if (pinToRight) {
|
||||
out.right += totalWidth - width;
|
||||
} else {
|
||||
out.left -= totalWidth - width;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSplitIconParams(View out, float onScreenRectCenterX,
|
||||
float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY,
|
||||
int drawableWidth, int drawableHeight, DeviceProfile dp,
|
||||
@StagePosition int stagePosition) {
|
||||
boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
float insetAdjustment = getPlaceholderSizeAdjustment(dp, pinToRight) / 2f;
|
||||
if (!dp.isLeftRightSplit) {
|
||||
out.setX(onScreenRectCenterX / fullscreenScaleX
|
||||
- 1.0f * drawableWidth / 2);
|
||||
out.setY((onScreenRectCenterY + insetAdjustment) / fullscreenScaleY
|
||||
- 1.0f * drawableHeight / 2);
|
||||
} else {
|
||||
if (pinToRight) {
|
||||
out.setX((onScreenRectCenterX - insetAdjustment) / fullscreenScaleX
|
||||
- 1.0f * drawableWidth / 2);
|
||||
} else {
|
||||
out.setX((onScreenRectCenterX + insetAdjustment) / fullscreenScaleX
|
||||
- 1.0f * drawableWidth / 2);
|
||||
}
|
||||
out.setY(onScreenRectCenterY / fullscreenScaleY
|
||||
- 1.0f * drawableHeight / 2);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The split placeholder comes with a default inset to buffer the icon from the top of the
|
||||
* screen. But if the device already has a large inset (from cutouts etc), use that instead.
|
||||
*/
|
||||
private int getPlaceholderSizeAdjustment(DeviceProfile dp, boolean pinToRight) {
|
||||
int insetThickness;
|
||||
if (!dp.isLandscape) {
|
||||
insetThickness = dp.getInsets().top;
|
||||
} else {
|
||||
insetThickness = pinToRight ? dp.getInsets().right : dp.getInsets().left;
|
||||
}
|
||||
return Math.max(insetThickness - dp.splitPlaceholderInset, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight,
|
||||
int splitInstructionsWidth) {
|
||||
out.setPivotX(0);
|
||||
out.setPivotY(splitInstructionsHeight);
|
||||
out.setRotation(getDegreesRotated());
|
||||
int distanceToEdge;
|
||||
if (dp.isPhone) {
|
||||
if (dp.isLandscape) {
|
||||
distanceToEdge = out.getResources().getDimensionPixelSize(
|
||||
R.dimen.split_instructions_bottom_margin_phone_landscape);
|
||||
} else {
|
||||
distanceToEdge = out.getResources().getDimensionPixelSize(
|
||||
R.dimen.split_instructions_bottom_margin_phone_portrait);
|
||||
}
|
||||
} else {
|
||||
distanceToEdge = dp.getOverviewActionsClaimedSpaceBelow();
|
||||
}
|
||||
|
||||
// Center the view in case of unbalanced insets on left or right of screen
|
||||
int insetCorrectionX = (dp.getInsets().right - dp.getInsets().left) / 2;
|
||||
// Adjust for any insets on the bottom edge
|
||||
int insetCorrectionY = dp.getInsets().bottom;
|
||||
out.setTranslationX(insetCorrectionX);
|
||||
out.setTranslationY(-distanceToEdge + insetCorrectionY);
|
||||
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) out.getLayoutParams();
|
||||
lp.gravity = CENTER_HORIZONTAL | BOTTOM;
|
||||
out.setLayoutParams(lp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getFinalSplitPlaceholderBounds(int splitDividerSize, DeviceProfile dp,
|
||||
@StagePosition int stagePosition, Rect out1, Rect out2) {
|
||||
int screenHeight = dp.heightPx;
|
||||
int screenWidth = dp.widthPx;
|
||||
out1.set(0, 0, screenWidth, screenHeight / 2 - splitDividerSize);
|
||||
out2.set(0, screenHeight / 2 + splitDividerSize, screenWidth, screenHeight);
|
||||
if (!dp.isLeftRightSplit) {
|
||||
// Portrait - the window bounds are always top and bottom half
|
||||
return;
|
||||
}
|
||||
|
||||
// Now we rotate the portrait rect depending on what side we want pinned
|
||||
boolean pinToRight = stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
float postRotateScale = (float) screenHeight / screenWidth;
|
||||
|
||||
mTmpMatrix.reset();
|
||||
mTmpMatrix.postRotate(pinToRight ? 90 : 270);
|
||||
mTmpMatrix.postTranslate(pinToRight ? screenHeight : 0, pinToRight ? 0 : screenWidth);
|
||||
mTmpMatrix.postScale(1 / postRotateScale, postRotateScale);
|
||||
|
||||
mTmpRectF.set(out1);
|
||||
mTmpMatrix.mapRect(mTmpRectF);
|
||||
mTmpRectF.roundOut(out1);
|
||||
|
||||
mTmpRectF.set(out2);
|
||||
mTmpMatrix.mapRect(mTmpRectF);
|
||||
mTmpRectF.roundOut(out2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect,
|
||||
SplitBounds splitInfo, int desiredStagePosition) {
|
||||
float topLeftTaskPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.topTaskPercent
|
||||
: splitInfo.leftTaskPercent;
|
||||
float dividerBarPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.dividerHeightPercent
|
||||
: splitInfo.dividerWidthPercent;
|
||||
|
||||
int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;
|
||||
float scale = (float) outRect.height() / (dp.availableHeightPx - taskbarHeight);
|
||||
float topTaskHeight = dp.availableHeightPx * topLeftTaskPercent;
|
||||
float scaledTopTaskHeight = topTaskHeight * scale;
|
||||
float dividerHeight = dp.availableHeightPx * dividerBarPercent;
|
||||
float scaledDividerHeight = dividerHeight * scale;
|
||||
|
||||
if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) {
|
||||
if (dp.isLeftRightSplit) {
|
||||
outRect.right = outRect.left + Math.round(outRect.width() * topLeftTaskPercent);
|
||||
} else {
|
||||
outRect.bottom = Math.round(outRect.top + scaledTopTaskHeight);
|
||||
}
|
||||
} else {
|
||||
if (dp.isLeftRightSplit) {
|
||||
outRect.left += Math.round(outRect.width()
|
||||
* (topLeftTaskPercent + dividerBarPercent));
|
||||
} else {
|
||||
outRect.top += Math.round(scaledTopTaskHeight + scaledDividerHeight);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,
|
||||
int parentWidth, int parentHeight, SplitBounds splitBoundsConfig,
|
||||
DeviceProfile dp, boolean isRtl) {
|
||||
int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;
|
||||
int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;
|
||||
float dividerScale = splitBoundsConfig.appsStackedVertically
|
||||
? splitBoundsConfig.dividerHeightPercent
|
||||
: splitBoundsConfig.dividerWidthPercent;
|
||||
int primarySnapshotHeight;
|
||||
int primarySnapshotWidth;
|
||||
int secondarySnapshotHeight;
|
||||
int secondarySnapshotWidth;
|
||||
float taskPercent = splitBoundsConfig.appsStackedVertically ?
|
||||
splitBoundsConfig.topTaskPercent : splitBoundsConfig.leftTaskPercent;
|
||||
if (dp.isLeftRightSplit) {
|
||||
int scaledDividerBar = Math.round(parentWidth * dividerScale);
|
||||
primarySnapshotHeight = totalThumbnailHeight;
|
||||
primarySnapshotWidth = Math.round(parentWidth * taskPercent);
|
||||
|
||||
secondarySnapshotHeight = totalThumbnailHeight;
|
||||
secondarySnapshotWidth = parentWidth - primarySnapshotWidth - scaledDividerBar;
|
||||
if (isRtl) {
|
||||
int translationX = secondarySnapshotWidth + scaledDividerBar;
|
||||
primarySnapshot.setTranslationX(-translationX);
|
||||
secondarySnapshot.setTranslationX(0);
|
||||
} else {
|
||||
int translationX = primarySnapshotWidth + scaledDividerBar;
|
||||
secondarySnapshot.setTranslationX(translationX);
|
||||
primarySnapshot.setTranslationX(0);
|
||||
}
|
||||
secondarySnapshot.setTranslationY(spaceAboveSnapshot);
|
||||
|
||||
// Reset unused translations
|
||||
primarySnapshot.setTranslationY(0);
|
||||
} else {
|
||||
int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;
|
||||
float scale = (float) totalThumbnailHeight / (dp.availableHeightPx - taskbarHeight);
|
||||
float topTaskHeight = dp.availableHeightPx * taskPercent;
|
||||
float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale);
|
||||
float scaledTopTaskHeight = topTaskHeight * scale;
|
||||
primarySnapshotWidth = parentWidth;
|
||||
primarySnapshotHeight = Math.round(scaledTopTaskHeight);
|
||||
|
||||
secondarySnapshotWidth = parentWidth;
|
||||
secondarySnapshotHeight = Math.round(totalThumbnailHeight - primarySnapshotHeight
|
||||
- finalDividerHeight);
|
||||
float translationY = primarySnapshotHeight + spaceAboveSnapshot + finalDividerHeight;
|
||||
secondarySnapshot.setTranslationY(translationY);
|
||||
|
||||
FrameLayout.LayoutParams primaryParams =
|
||||
(FrameLayout.LayoutParams) primarySnapshot.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryParams =
|
||||
(FrameLayout.LayoutParams) secondarySnapshot.getLayoutParams();
|
||||
secondaryParams.topMargin = 0;
|
||||
primaryParams.topMargin = spaceAboveSnapshot;
|
||||
|
||||
// Reset unused translations
|
||||
primarySnapshot.setTranslationY(0);
|
||||
secondarySnapshot.setTranslationX(0);
|
||||
primarySnapshot.setTranslationX(0);
|
||||
}
|
||||
primarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotHeight, View.MeasureSpec.EXACTLY));
|
||||
secondarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotHeight,
|
||||
View.MeasureSpec.EXACTLY));
|
||||
primarySnapshot.setScaleX(1);
|
||||
secondarySnapshot.setScaleX(1);
|
||||
primarySnapshot.setScaleY(1);
|
||||
secondarySnapshot.setScaleY(1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTaskIconParams(FrameLayout.LayoutParams iconParams, int taskIconMargin,
|
||||
int taskIconHeight, int thumbnailTopMargin, boolean isRtl) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
iconParams.setMarginStart(taskIconMargin);
|
||||
iconParams.gravity = Gravity.START | Gravity.CENTER_VERTICAL;
|
||||
iconParams.topMargin = 0;
|
||||
return;
|
||||
}
|
||||
iconParams.gravity = TOP | CENTER_HORIZONTAL;
|
||||
// Reset margins, since they may have been set on rotation
|
||||
iconParams.leftMargin = iconParams.rightMargin = 0;
|
||||
iconParams.topMargin = iconParams.bottomMargin = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setIconAppChipMenuParams(View iconAppChipMenuView,
|
||||
FrameLayout.LayoutParams iconMenuParams, int iconMenuMargin, int thumbnailTopMargin) {
|
||||
iconMenuParams.gravity = TOP | START;
|
||||
iconMenuParams.setMarginStart(iconMenuMargin);
|
||||
iconMenuParams.topMargin = thumbnailTopMargin;
|
||||
iconMenuParams.bottomMargin = 0;
|
||||
iconMenuParams.setMarginEnd(0);
|
||||
|
||||
iconAppChipMenuView.setPivotX(0);
|
||||
iconAppChipMenuView.setPivotY(0);
|
||||
iconAppChipMenuView.setTranslationY(0);
|
||||
iconAppChipMenuView.setRotation(getDegreesRotated());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitIconParams(View primaryIconView, View secondaryIconView,
|
||||
int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight,
|
||||
int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl,
|
||||
DeviceProfile deviceProfile, SplitBounds splitConfig) {
|
||||
FrameLayout.LayoutParams primaryIconParams =
|
||||
(FrameLayout.LayoutParams) primaryIconView.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryIconParams = enableOverviewIconMenu()
|
||||
? (FrameLayout.LayoutParams) secondaryIconView.getLayoutParams()
|
||||
: new FrameLayout.LayoutParams(primaryIconParams);
|
||||
|
||||
if (enableOverviewIconMenu()) {
|
||||
primaryIconParams.gravity = TOP | START;
|
||||
secondaryIconParams.gravity = TOP | START;
|
||||
secondaryIconParams.topMargin = primaryIconParams.topMargin;
|
||||
secondaryIconParams.setMarginStart(primaryIconParams.getMarginStart());
|
||||
if (deviceProfile.isLeftRightSplit) {
|
||||
if (isRtl) {
|
||||
int secondarySnapshotWidth = groupedTaskViewWidth - primarySnapshotWidth;
|
||||
primaryIconView.setTranslationX(-secondarySnapshotWidth);
|
||||
} else {
|
||||
secondaryIconView.setTranslationX(primarySnapshotWidth);
|
||||
}
|
||||
} else {
|
||||
primaryIconView.setTranslationX(0);
|
||||
secondaryIconView.setTranslationX(0);
|
||||
int dividerThickness = Math.min(splitConfig.visualDividerBounds.width(),
|
||||
splitConfig.visualDividerBounds.height());
|
||||
secondaryIconView.setTranslationY(
|
||||
primarySnapshotHeight + (deviceProfile.isTablet ? 0 : dividerThickness));
|
||||
}
|
||||
} else if (deviceProfile.isLeftRightSplit) {
|
||||
// We calculate the "midpoint" of the thumbnail area, and place the icons there.
|
||||
// This is the place where the thumbnail area splits by default, in a near-50/50 split.
|
||||
// It is usually not exactly 50/50, due to insets/screen cutouts.
|
||||
int fullscreenInsetThickness = deviceProfile.isSeascape()
|
||||
? deviceProfile.getInsets().right
|
||||
: deviceProfile.getInsets().left;
|
||||
int fullscreenMidpointFromBottom = ((deviceProfile.widthPx
|
||||
- fullscreenInsetThickness) / 2);
|
||||
float midpointFromEndPct = (float) fullscreenMidpointFromBottom
|
||||
/ deviceProfile.widthPx;
|
||||
float insetPct = (float) fullscreenInsetThickness / deviceProfile.widthPx;
|
||||
int spaceAboveSnapshots = 0;
|
||||
int overviewThumbnailAreaThickness = groupedTaskViewWidth - spaceAboveSnapshots;
|
||||
int bottomToMidpointOffset = (int) (overviewThumbnailAreaThickness
|
||||
* midpointFromEndPct);
|
||||
int insetOffset = (int) (overviewThumbnailAreaThickness * insetPct);
|
||||
|
||||
if (deviceProfile.isSeascape()) {
|
||||
primaryIconParams.gravity = TOP | (isRtl ? END : START);
|
||||
secondaryIconParams.gravity = TOP | (isRtl ? END : START);
|
||||
if (splitConfig.initiatedFromSeascape) {
|
||||
// if the split was initiated from seascape,
|
||||
// the task on the right (secondary) is slightly larger
|
||||
primaryIconView.setTranslationX(bottomToMidpointOffset - taskIconHeight);
|
||||
secondaryIconView.setTranslationX(bottomToMidpointOffset);
|
||||
} else {
|
||||
// if not,
|
||||
// the task on the left (primary) is slightly larger
|
||||
primaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset
|
||||
- taskIconHeight);
|
||||
secondaryIconView.setTranslationX(bottomToMidpointOffset + insetOffset);
|
||||
}
|
||||
} else {
|
||||
primaryIconParams.gravity = TOP | (isRtl ? START : END);
|
||||
secondaryIconParams.gravity = TOP | (isRtl ? START : END);
|
||||
if (!splitConfig.initiatedFromSeascape) {
|
||||
// if the split was initiated from landscape,
|
||||
// the task on the left (primary) is slightly larger
|
||||
primaryIconView.setTranslationX(-bottomToMidpointOffset);
|
||||
secondaryIconView.setTranslationX(-bottomToMidpointOffset + taskIconHeight);
|
||||
} else {
|
||||
// if not,
|
||||
// the task on the right (secondary) is slightly larger
|
||||
primaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset);
|
||||
secondaryIconView.setTranslationX(-bottomToMidpointOffset - insetOffset
|
||||
+ taskIconHeight);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
primaryIconParams.gravity = TOP | CENTER_HORIZONTAL;
|
||||
// shifts icon half a width left (height is used here since icons are square)
|
||||
primaryIconView.setTranslationX(-(taskIconHeight / 2f));
|
||||
secondaryIconParams.gravity = TOP | CENTER_HORIZONTAL;
|
||||
secondaryIconView.setTranslationX(taskIconHeight / 2f);
|
||||
}
|
||||
if (!enableOverviewIconMenu()) {
|
||||
primaryIconView.setTranslationY(0);
|
||||
secondaryIconView.setTranslationY(0);
|
||||
}
|
||||
|
||||
primaryIconView.setLayoutParams(primaryIconParams);
|
||||
secondaryIconView.setLayoutParams(secondaryIconParams);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDefaultSplitPosition(DeviceProfile deviceProfile) {
|
||||
if (!deviceProfile.isTablet) {
|
||||
throw new IllegalStateException("Default position available only for large screens");
|
||||
}
|
||||
if (deviceProfile.isLeftRightSplit) {
|
||||
return STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
} else {
|
||||
return STAGE_POSITION_TOP_OR_LEFT;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Pair<FloatProperty, FloatProperty> getSplitSelectTaskOffset(FloatProperty primary,
|
||||
FloatProperty secondary, DeviceProfile deviceProfile) {
|
||||
if (deviceProfile.isLeftRightSplit) { // or seascape
|
||||
return new Pair<>(primary, secondary);
|
||||
} else {
|
||||
return new Pair<>(secondary, primary);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getFloatingTaskOffscreenTranslationTarget(View floatingTask, RectF onScreenRect,
|
||||
@StagePosition int stagePosition, DeviceProfile dp) {
|
||||
if (dp.isLeftRightSplit) {
|
||||
float currentTranslationX = floatingTask.getTranslationX();
|
||||
return stagePosition == STAGE_POSITION_TOP_OR_LEFT
|
||||
? currentTranslationX - onScreenRect.width()
|
||||
: currentTranslationX + onScreenRect.width();
|
||||
} else {
|
||||
float currentTranslationY = floatingTask.getTranslationY();
|
||||
return currentTranslationY - onScreenRect.height();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFloatingTaskPrimaryTranslation(View floatingTask, float translation,
|
||||
DeviceProfile dp) {
|
||||
if (dp.isLeftRightSplit) {
|
||||
floatingTask.setTranslationX(translation);
|
||||
} else {
|
||||
floatingTask.setTranslationY(translation);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Float getFloatingTaskPrimaryTranslation(View floatingTask, DeviceProfile dp) {
|
||||
return dp.isLeftRightSplit
|
||||
? floatingTask.getTranslationX()
|
||||
: floatingTask.getTranslationY();
|
||||
}
|
||||
}
|
||||
@@ -1,392 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2019 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.launcher3.touch;
|
||||
|
||||
import static android.view.Gravity.BOTTOM;
|
||||
import static android.view.Gravity.CENTER_VERTICAL;
|
||||
import static android.view.Gravity.END;
|
||||
import static android.view.Gravity.RIGHT;
|
||||
import static android.view.Gravity.START;
|
||||
import static android.view.Gravity.TOP;
|
||||
import static android.view.View.LAYOUT_DIRECTION_RTL;
|
||||
|
||||
import static com.android.launcher3.Flags.enableOverviewIconMenu;
|
||||
import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED;
|
||||
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_MAIN;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
import android.util.Pair;
|
||||
import android.view.Gravity;
|
||||
import android.view.Surface;
|
||||
import android.view.View;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import com.android.launcher3.DeviceProfile;
|
||||
import com.android.launcher3.R;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
||||
import com.android.launcher3.views.BaseDragLayer;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class SeascapePagedViewHandler extends LandscapePagedViewHandler {
|
||||
|
||||
@Override
|
||||
public int getSecondaryTranslationDirectionFactor() {
|
||||
return -1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getSplitTranslationDirectionFactor(int stagePosition, DeviceProfile deviceProfile) {
|
||||
if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
|
||||
return -1;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean getRecentsRtlSetting(Resources resources) {
|
||||
return Utilities.isRtl(resources);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDegreesRotated() {
|
||||
return 270;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRotation() {
|
||||
return Surface.ROTATION_270;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void adjustFloatingIconStartVelocity(PointF velocity) {
|
||||
float oldX = velocity.x;
|
||||
float oldY = velocity.y;
|
||||
velocity.set(oldY, -oldX);
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuX(float x, View thumbnailView,
|
||||
DeviceProfile deviceProfile, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return x + (taskViewIcon.getHeight() * 2);
|
||||
}
|
||||
return x + taskInsetMargin;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getTaskMenuY(float y, View thumbnailView, int stagePosition,
|
||||
View taskMenuView, float taskInsetMargin, View taskViewIcon) {
|
||||
if (enableOverviewIconMenu()) {
|
||||
return y + taskViewIcon.getWidth() + (
|
||||
thumbnailView.getLayoutDirection() == LAYOUT_DIRECTION_RTL ? taskInsetMargin
|
||||
/ 2f : -taskViewIcon.getHeight());
|
||||
}
|
||||
BaseDragLayer.LayoutParams lp = (BaseDragLayer.LayoutParams) taskMenuView.getLayoutParams();
|
||||
int taskMenuWidth = lp.width;
|
||||
if (stagePosition == STAGE_POSITION_UNDEFINED) {
|
||||
return y + taskInsetMargin
|
||||
+ (thumbnailView.getMeasuredHeight() + taskMenuWidth) / 2f;
|
||||
} else {
|
||||
return y + taskMenuWidth + taskInsetMargin;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, SplitBounds splitInfo,
|
||||
int desiredStagePosition) {
|
||||
float topLeftTaskPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.topTaskPercent
|
||||
: splitInfo.leftTaskPercent;
|
||||
float dividerBarPercent = splitInfo.appsStackedVertically
|
||||
? splitInfo.dividerHeightPercent
|
||||
: splitInfo.dividerWidthPercent;
|
||||
|
||||
// In seascape, the primary thumbnail is counterintuitively placed at the physical bottom of
|
||||
// the screen. This is to preserve consistency when the user rotates: From the user's POV,
|
||||
// the primary should always be on the left.
|
||||
if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) {
|
||||
outRect.top += (int) (outRect.height() * ((1 - topLeftTaskPercent)));
|
||||
} else {
|
||||
outRect.bottom -= (int) (outRect.height() * (topLeftTaskPercent + dividerBarPercent));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Pair<Float, Float> getDwbLayoutTranslations(int taskViewWidth,
|
||||
int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile,
|
||||
View[] thumbnailViews, int desiredTaskId, View banner) {
|
||||
boolean isRtl = banner.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
|
||||
float translationX = 0;
|
||||
float translationY = 0;
|
||||
FrameLayout.LayoutParams bannerParams = (FrameLayout.LayoutParams) banner.getLayoutParams();
|
||||
banner.setPivotX(0);
|
||||
banner.setPivotY(0);
|
||||
banner.setRotation(getDegreesRotated());
|
||||
translationX = taskViewWidth - banner.getHeight();
|
||||
FrameLayout.LayoutParams snapshotParams =
|
||||
(FrameLayout.LayoutParams) thumbnailViews[0]
|
||||
.getLayoutParams();
|
||||
bannerParams.gravity = BOTTOM | (isRtl ? END : START);
|
||||
|
||||
if (splitBounds == null) {
|
||||
// Single, fullscreen case
|
||||
bannerParams.width = taskViewHeight - snapshotParams.topMargin;
|
||||
translationY = banner.getHeight();
|
||||
return new Pair<>(translationX, translationY);
|
||||
}
|
||||
|
||||
// Set correct width
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
bannerParams.width = thumbnailViews[0].getMeasuredHeight();
|
||||
} else {
|
||||
bannerParams.width = thumbnailViews[1].getMeasuredHeight();
|
||||
}
|
||||
|
||||
// Set translations
|
||||
if (desiredTaskId == splitBounds.rightBottomTaskId) {
|
||||
translationY = banner.getHeight();
|
||||
}
|
||||
if (desiredTaskId == splitBounds.leftTopTaskId) {
|
||||
float bottomRightTaskPlusDividerPercent = splitBounds.appsStackedVertically
|
||||
? (1f - splitBounds.topTaskPercent)
|
||||
: (1f - splitBounds.leftTaskPercent);
|
||||
translationY = banner.getHeight()
|
||||
- ((taskViewHeight - snapshotParams.topMargin)
|
||||
* bottomRightTaskPlusDividerPercent);
|
||||
}
|
||||
return new Pair<>(translationX, translationY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDistanceToBottomOfRect(DeviceProfile dp, Rect rect) {
|
||||
return dp.widthPx - rect.right;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SplitPositionOption> getSplitPositionOptions(DeviceProfile dp) {
|
||||
// Add "right" option which is actually the top
|
||||
return Collections.singletonList(new SplitPositionOption(
|
||||
R.drawable.ic_split_horizontal, R.string.recent_task_option_split_screen,
|
||||
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_MAIN));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitInstructionsParams(View out, DeviceProfile dp, int splitInstructionsHeight,
|
||||
int splitInstructionsWidth) {
|
||||
out.setPivotX(0);
|
||||
out.setPivotY(splitInstructionsHeight);
|
||||
out.setRotation(getDegreesRotated());
|
||||
int distanceToEdge = out.getResources().getDimensionPixelSize(
|
||||
R.dimen.split_instructions_bottom_margin_phone_landscape);
|
||||
// Adjust for any insets on the right edge
|
||||
int insetCorrectionX = dp.getInsets().right;
|
||||
// Center the view in case of unbalanced insets on top or bottom of screen
|
||||
int insetCorrectionY = (dp.getInsets().bottom - dp.getInsets().top) / 2;
|
||||
out.setTranslationX(splitInstructionsWidth - distanceToEdge + insetCorrectionX);
|
||||
out.setTranslationY(((-splitInstructionsHeight + splitInstructionsWidth) / 2f)
|
||||
+ insetCorrectionY);
|
||||
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) out.getLayoutParams();
|
||||
// Setting gravity to RIGHT instead of the lint-recommended END because we always want this
|
||||
// view to be screen-right when phone is in seascape, regardless of the RtL setting.
|
||||
lp.gravity = RIGHT | CENTER_VERTICAL;
|
||||
out.setLayoutParams(lp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTaskIconParams(FrameLayout.LayoutParams iconParams,
|
||||
int taskIconMargin, int taskIconHeight, int thumbnailTopMargin, boolean isRtl) {
|
||||
iconParams.rightMargin = 0;
|
||||
iconParams.bottomMargin = 0;
|
||||
if (enableOverviewIconMenu()) {
|
||||
iconParams.setMarginStart(taskIconMargin);
|
||||
iconParams.gravity = Gravity.START | Gravity.CENTER_VERTICAL;
|
||||
iconParams.leftMargin = 0;
|
||||
iconParams.topMargin = 0;
|
||||
} else {
|
||||
iconParams.gravity = (isRtl ? END : START) | CENTER_VERTICAL;
|
||||
iconParams.leftMargin = -taskIconHeight - taskIconMargin / 2;
|
||||
iconParams.topMargin = thumbnailTopMargin / 2;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setIconAppChipMenuParams(View iconAppChipMenuView,
|
||||
FrameLayout.LayoutParams iconMenuParams, int iconMenuMargin, int thumbnailTopMargin) {
|
||||
boolean isRtl = iconAppChipMenuView.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
|
||||
iconMenuParams.gravity = (isRtl ? TOP : BOTTOM) | (isRtl ? END : START);
|
||||
iconMenuParams.setMarginStart(0);
|
||||
iconMenuParams.topMargin = isRtl ? iconMenuMargin : 0;
|
||||
iconMenuParams.bottomMargin = 0;
|
||||
iconMenuParams.setMarginEnd(isRtl ? thumbnailTopMargin : 0);
|
||||
|
||||
// Use half menu height to place the pivot within the X/Y center of icon in the menu.
|
||||
float iconCenter = iconAppChipMenuView.getHeight() / 2f;
|
||||
iconAppChipMenuView.setPivotX(isRtl ? iconMenuParams.width / 2f : iconCenter);
|
||||
iconAppChipMenuView.setPivotY(
|
||||
isRtl ? iconMenuParams.width / 2f : iconCenter - iconMenuMargin);
|
||||
iconAppChipMenuView.setTranslationY(0);
|
||||
iconAppChipMenuView.setRotation(getDegreesRotated());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSplitIconParams(View primaryIconView, View secondaryIconView,
|
||||
int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight,
|
||||
int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl,
|
||||
DeviceProfile deviceProfile, SplitBounds splitConfig) {
|
||||
super.setSplitIconParams(primaryIconView, secondaryIconView, taskIconHeight,
|
||||
primarySnapshotWidth, primarySnapshotHeight, groupedTaskViewHeight,
|
||||
groupedTaskViewWidth, isRtl, deviceProfile, splitConfig);
|
||||
FrameLayout.LayoutParams primaryIconParams =
|
||||
(FrameLayout.LayoutParams) primaryIconView.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryIconParams =
|
||||
(FrameLayout.LayoutParams) secondaryIconView.getLayoutParams();
|
||||
|
||||
// We calculate the "midpoint" of the thumbnail area, and place the icons there.
|
||||
// This is the place where the thumbnail area splits by default, in a near-50/50 split.
|
||||
// It is usually not exactly 50/50, due to insets/screen cutouts.
|
||||
int fullscreenInsetThickness = deviceProfile.getInsets().top
|
||||
- deviceProfile.getInsets().bottom;
|
||||
int fullscreenMidpointFromBottom = ((deviceProfile.heightPx
|
||||
- fullscreenInsetThickness) / 2);
|
||||
float midpointFromBottomPct = (float) fullscreenMidpointFromBottom / deviceProfile.heightPx;
|
||||
float insetPct = (float) fullscreenInsetThickness / deviceProfile.heightPx;
|
||||
int spaceAboveSnapshots = deviceProfile.overviewTaskThumbnailTopMarginPx;
|
||||
int overviewThumbnailAreaThickness = groupedTaskViewHeight - spaceAboveSnapshots;
|
||||
int bottomToMidpointOffset = (int) (overviewThumbnailAreaThickness * midpointFromBottomPct);
|
||||
int insetOffset = (int) (overviewThumbnailAreaThickness * insetPct);
|
||||
|
||||
int gravity = (isRtl ? TOP : BOTTOM) | (isRtl ? END : START);
|
||||
primaryIconParams.gravity = gravity;
|
||||
secondaryIconParams.gravity = gravity;
|
||||
primaryIconView.setTranslationX(0);
|
||||
secondaryIconView.setTranslationX(0);
|
||||
if (enableOverviewIconMenu()) {
|
||||
if (isRtl) {
|
||||
primaryIconView.setTranslationY(groupedTaskViewHeight - primarySnapshotHeight);
|
||||
secondaryIconView.setTranslationY(0);
|
||||
} else {
|
||||
secondaryIconView.setTranslationY(-primarySnapshotHeight);
|
||||
primaryIconView.setTranslationY(0);
|
||||
}
|
||||
} else if (splitConfig.initiatedFromSeascape) {
|
||||
// if the split was initiated from seascape,
|
||||
// the task on the right (secondary) is slightly larger
|
||||
if (isRtl) {
|
||||
primaryIconView.setTranslationY(bottomToMidpointOffset - insetOffset
|
||||
+ taskIconHeight);
|
||||
secondaryIconView.setTranslationY(bottomToMidpointOffset - insetOffset);
|
||||
} else {
|
||||
primaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset
|
||||
+ taskIconHeight);
|
||||
secondaryIconView.setTranslationY(-bottomToMidpointOffset - insetOffset);
|
||||
}
|
||||
} else {
|
||||
// if not,
|
||||
// the task on the left (primary) is slightly larger
|
||||
if (isRtl) {
|
||||
primaryIconView.setTranslationY(bottomToMidpointOffset + taskIconHeight);
|
||||
secondaryIconView.setTranslationY(bottomToMidpointOffset);
|
||||
} else {
|
||||
primaryIconView.setTranslationY(-bottomToMidpointOffset + taskIconHeight);
|
||||
secondaryIconView.setTranslationY(-bottomToMidpointOffset);
|
||||
}
|
||||
}
|
||||
|
||||
primaryIconView.setLayoutParams(primaryIconParams);
|
||||
secondaryIconView.setLayoutParams(secondaryIconParams);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot,
|
||||
int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, DeviceProfile dp,
|
||||
boolean isRtl) {
|
||||
FrameLayout.LayoutParams primaryParams =
|
||||
(FrameLayout.LayoutParams) primarySnapshot.getLayoutParams();
|
||||
FrameLayout.LayoutParams secondaryParams =
|
||||
(FrameLayout.LayoutParams) secondarySnapshot.getLayoutParams();
|
||||
|
||||
// Swap the margins that are set in TaskView#setRecentsOrientedState()
|
||||
secondaryParams.topMargin = dp.overviewTaskThumbnailTopMarginPx;
|
||||
primaryParams.topMargin = 0;
|
||||
|
||||
// Measure and layout the thumbnails bottom up, since the primary is on the visual left
|
||||
// (portrait bottom) and secondary is on the right (portrait top)
|
||||
int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;
|
||||
int totalThumbnailHeight = parentHeight - spaceAboveSnapshot;
|
||||
int dividerBar = Math.round(totalThumbnailHeight * (splitBoundsConfig.appsStackedVertically
|
||||
? splitBoundsConfig.dividerHeightPercent
|
||||
: splitBoundsConfig.dividerWidthPercent));
|
||||
int primarySnapshotHeight;
|
||||
int primarySnapshotWidth;
|
||||
int secondarySnapshotHeight;
|
||||
int secondarySnapshotWidth;
|
||||
|
||||
float taskPercent = splitBoundsConfig.appsStackedVertically ?
|
||||
splitBoundsConfig.topTaskPercent : splitBoundsConfig.leftTaskPercent;
|
||||
primarySnapshotWidth = parentWidth;
|
||||
primarySnapshotHeight = (int) (totalThumbnailHeight * (taskPercent));
|
||||
|
||||
secondarySnapshotWidth = parentWidth;
|
||||
secondarySnapshotHeight = totalThumbnailHeight - primarySnapshotHeight - dividerBar;
|
||||
secondarySnapshot.setTranslationY(0);
|
||||
primarySnapshot.setTranslationY(secondarySnapshotHeight + spaceAboveSnapshot + dividerBar);
|
||||
|
||||
primarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(primarySnapshotHeight, View.MeasureSpec.EXACTLY)
|
||||
);
|
||||
secondarySnapshot.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotWidth, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(secondarySnapshotHeight, View.MeasureSpec.EXACTLY)
|
||||
);
|
||||
}
|
||||
|
||||
/* ---------- The following are only used by TaskViewTouchHandler. ---------- */
|
||||
|
||||
@Override
|
||||
public SingleAxisSwipeDetector.Direction getUpDownSwipeDirection() {
|
||||
return HORIZONTAL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUpDirection(boolean isRtl) {
|
||||
return isRtl ? SingleAxisSwipeDetector.DIRECTION_POSITIVE
|
||||
: SingleAxisSwipeDetector.DIRECTION_NEGATIVE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGoingUp(float displacement, boolean isRtl) {
|
||||
return isRtl ? displacement > 0 : displacement < 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTaskDragDisplacementFactor(boolean isRtl) {
|
||||
return isRtl ? -1 : 1;
|
||||
}
|
||||
|
||||
/* -------------------- */
|
||||
}
|
||||
Reference in New Issue
Block a user