dedbc8ac36
- Grid scaling has problem that scales task icon and menu, which makes it hard to control icon size and text size in the manula - Replaced the whole concept with dedicated Task size calculation in grid layout - Support different icon size in TaskView in grid and removed task_thumbnail_top_margin - Removed grid progress in TaskViewSimulator as well - Refactored how ClearAllButton scroll and translations are calcualted to align clear all properly in grid - Make page center calculation aware of PagedView pivot and scaling Bug: 174464863 Test: Manual on two screens Change-Id: I47b13ef6e55c6e16c52ea04225f5bde02ed82fc2
338 lines
10 KiB
Java
338 lines
10 KiB
Java
/*
|
|
* 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 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 static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_SIDE;
|
|
|
|
import android.content.res.Resources;
|
|
import android.graphics.PointF;
|
|
import android.graphics.Rect;
|
|
import android.graphics.RectF;
|
|
import android.util.FloatProperty;
|
|
import android.view.MotionEvent;
|
|
import android.view.Surface;
|
|
import android.view.VelocityTracker;
|
|
import android.view.View;
|
|
import android.view.accessibility.AccessibilityEvent;
|
|
import android.widget.LinearLayout;
|
|
|
|
import com.android.launcher3.DeviceProfile;
|
|
import com.android.launcher3.PagedView;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.Utilities;
|
|
import com.android.launcher3.util.OverScroller;
|
|
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
public class PortraitPagedViewHandler implements PagedOrientationHandler {
|
|
|
|
@Override
|
|
public <T> T getPrimaryValue(T x, T y) {
|
|
return x;
|
|
}
|
|
|
|
@Override
|
|
public <T> T getSecondaryValue(T x, T y) {
|
|
return y;
|
|
}
|
|
|
|
@Override
|
|
public void delegateScrollTo(PagedView pagedView, int secondaryScroll, int primaryScroll) {
|
|
pagedView.superScrollTo(primaryScroll, secondaryScroll);
|
|
}
|
|
|
|
@Override
|
|
public void delegateScrollBy(PagedView pagedView, int unboundedScroll, int x, int y) {
|
|
pagedView.scrollTo(unboundedScroll + x, pagedView.getScrollY() + y);
|
|
}
|
|
|
|
@Override
|
|
public void scrollerStartScroll(OverScroller scroller, int newPosition) {
|
|
scroller.startScroll(newPosition - scroller.getCurrPos(), scroller.getCurrPos());
|
|
}
|
|
|
|
@Override
|
|
public void getCurveProperties(PagedView view, Rect insets, CurveProperties out) {
|
|
out.scroll = view.getScrollX();
|
|
out.halfPageSize = view.getNormalChildWidth() / 2;
|
|
out.halfScreenSize = view.getMeasuredWidth() / 2;
|
|
out.screenCenter = insets.left + view.getPaddingLeft() + out.scroll + out.halfPageSize;
|
|
}
|
|
|
|
@Override
|
|
public boolean isLayoutNaturalToLauncher() {
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
public void adjustFloatingIconStartVelocity(PointF velocity) {
|
|
//no-op
|
|
}
|
|
|
|
@Override
|
|
public void delegateScrollTo(PagedView pagedView, int primaryScroll) {
|
|
pagedView.superScrollTo(primaryScroll, pagedView.getScrollY());
|
|
}
|
|
|
|
@Override
|
|
public <T> void set(T target, Int2DAction<T> action, int param) {
|
|
action.call(target, param, 0);
|
|
}
|
|
|
|
@Override
|
|
public <T> void set(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 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 float getPrimarySize(RectF rect) {
|
|
return rect.width();
|
|
}
|
|
|
|
@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 int getChildStart(View view) {
|
|
return view.getLeft();
|
|
}
|
|
|
|
@Override
|
|
public float getChildStartWithTranslation(View view) {
|
|
return view.getLeft() + view.getTranslationX();
|
|
}
|
|
|
|
@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 int getPrimaryTranslationDirectionFactor() {
|
|
return 1;
|
|
}
|
|
|
|
public int getSecondaryTranslationDirectionFactor() {
|
|
return -1;
|
|
}
|
|
|
|
@Override
|
|
public int getSplitTranslationDirectionFactor(int stagePosition) {
|
|
if (stagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
|
|
return -1;
|
|
} else {
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int getSplitAnimationTranslation(int translationOffset, DeviceProfile dp) {
|
|
if (dp.isLandscape) {
|
|
return translationOffset;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
@Override
|
|
public float getTaskMenuX(float x, View thumbnailView) {
|
|
return x;
|
|
}
|
|
|
|
@Override
|
|
public float getTaskMenuY(float y, View thumbnailView) {
|
|
return y;
|
|
}
|
|
|
|
@Override
|
|
public int getTaskMenuWidth(View view) {
|
|
return view.getMeasuredWidth();
|
|
}
|
|
|
|
@Override
|
|
public int getTaskMenuLayoutOrientation(boolean canRecentsActivityRotate,
|
|
LinearLayout taskMenuLayout) {
|
|
return canRecentsActivityRotate ? taskMenuLayout.getOrientation() : LinearLayout.VERTICAL;
|
|
}
|
|
|
|
@Override
|
|
public void setLayoutParamsForTaskMenuOptionItem(LinearLayout.LayoutParams lp) {
|
|
// no-op, defaults are fine
|
|
}
|
|
|
|
/* ---------- 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) {
|
|
List<SplitPositionOption> options = new ArrayList<>(2);
|
|
// TODO: Add in correct icons
|
|
if (dp.isLandscape) { // or seascape
|
|
// Add left/right options
|
|
options.add(new SplitPositionOption(
|
|
R.drawable.ic_split_screen, R.string.split_screen_position_left,
|
|
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
|
|
options.add(new SplitPositionOption(
|
|
R.drawable.ic_split_screen, R.string.split_screen_position_right,
|
|
STAGE_POSITION_BOTTOM_OR_RIGHT, STAGE_TYPE_SIDE));
|
|
} else {
|
|
// Only add top option
|
|
options.add(new SplitPositionOption(
|
|
R.drawable.ic_split_screen, R.string.split_screen_position_top,
|
|
STAGE_POSITION_TOP_OR_LEFT, STAGE_TYPE_MAIN));
|
|
}
|
|
return options;
|
|
}
|
|
|
|
@Override
|
|
public FloatProperty getSplitSelectTaskOffset(FloatProperty primary, FloatProperty secondary,
|
|
DeviceProfile dp) {
|
|
if (dp.isLandscape) { // or seascape
|
|
return primary;
|
|
} else {
|
|
return secondary;
|
|
}
|
|
}
|
|
}
|