mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 02:38:20 +00:00
Folder icon polish.
- Increase the overlap between the preview items and the background
so that it appears more intentional (lots of reports of users
thinking that its a bug)
- Fix bug where clip path was still clipping icons when
dragging and swiping to home.
Bug: 194339057
Bug: 193701705
Bug: 191225536
Test: test 2 icon, 3 icon, and 4 icon folders
close folder on 2nd page, ensure clipping
ensure no preview items are clipped in drag view
ensure no preview items are clipped in swipe up to home
test 2x2, 3x3, 4x4, 4x5, and 5x5 grids to ensure no clipping
of folder icons
drag and drop folder in and out of hotseat
create folders (2 icon, 3 icon, 4 icon)
Change-Id: I09ce9ef59e340b1009de3d26eed430a0a8dc4b33
Merged-In: Id49bae33438e10248bef05450d7e2c92c2140748
267 lines
9.9 KiB
Java
267 lines
9.9 KiB
Java
/*
|
|
* Copyright (C) 2008 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;
|
|
|
|
import static android.view.MotionEvent.ACTION_DOWN;
|
|
|
|
import static com.android.launcher3.CellLayout.FOLDER;
|
|
import static com.android.launcher3.CellLayout.WORKSPACE;
|
|
|
|
import android.app.WallpaperManager;
|
|
import android.content.Context;
|
|
import android.graphics.Rect;
|
|
import android.view.MotionEvent;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
|
|
import com.android.launcher3.CellLayout.ContainerType;
|
|
import com.android.launcher3.folder.FolderIcon;
|
|
import com.android.launcher3.views.ActivityContext;
|
|
import com.android.launcher3.widget.NavigableAppWidgetHostView;
|
|
|
|
public class ShortcutAndWidgetContainer extends ViewGroup implements FolderIcon.FolderIconParent {
|
|
static final String TAG = "ShortcutAndWidgetContainer";
|
|
|
|
// These are temporary variables to prevent having to allocate a new object just to
|
|
// return an (x, y) value from helper functions. Do NOT use them to maintain other state.
|
|
private final int[] mTmpCellXY = new int[2];
|
|
|
|
private final Rect mTempRect = new Rect();
|
|
|
|
@ContainerType
|
|
private final int mContainerType;
|
|
private final WallpaperManager mWallpaperManager;
|
|
|
|
private int mCellWidth;
|
|
private int mCellHeight;
|
|
private int mBorderSpacing;
|
|
|
|
private int mCountX;
|
|
private int mCountY;
|
|
|
|
private final ActivityContext mActivity;
|
|
private boolean mInvertIfRtl = false;
|
|
|
|
public ShortcutAndWidgetContainer(Context context, @ContainerType int containerType) {
|
|
super(context);
|
|
mActivity = ActivityContext.lookupContext(context);
|
|
mWallpaperManager = WallpaperManager.getInstance(context);
|
|
mContainerType = containerType;
|
|
}
|
|
|
|
public void setCellDimensions(int cellWidth, int cellHeight, int countX, int countY,
|
|
int borderSpacing) {
|
|
mCellWidth = cellWidth;
|
|
mCellHeight = cellHeight;
|
|
mCountX = countX;
|
|
mCountY = countY;
|
|
mBorderSpacing = borderSpacing;
|
|
}
|
|
|
|
public View getChildAt(int cellX, int cellY) {
|
|
final int count = getChildCount();
|
|
for (int i = 0; i < count; i++) {
|
|
View child = getChildAt(i);
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
|
|
if ((lp.cellX <= cellX) && (cellX < lp.cellX + lp.cellHSpan)
|
|
&& (lp.cellY <= cellY) && (cellY < lp.cellY + lp.cellVSpan)) {
|
|
return child;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
|
|
int count = getChildCount();
|
|
|
|
int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
|
|
int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
|
|
setMeasuredDimension(widthSpecSize, heightSpecSize);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
View child = getChildAt(i);
|
|
if (child.getVisibility() != GONE) {
|
|
measureChild(child);
|
|
}
|
|
}
|
|
}
|
|
|
|
public void setupLp(View child) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
if (child instanceof NavigableAppWidgetHostView) {
|
|
DeviceProfile profile = mActivity.getDeviceProfile();
|
|
((NavigableAppWidgetHostView) child).getWidgetInset(profile, mTempRect);
|
|
lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
|
|
profile.appWidgetScale.x, profile.appWidgetScale.y, mBorderSpacing, mTempRect);
|
|
} else {
|
|
lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
|
|
mBorderSpacing, null);
|
|
}
|
|
}
|
|
|
|
// Set whether or not to invert the layout horizontally if the layout is in RTL mode.
|
|
public void setInvertIfRtl(boolean invert) {
|
|
mInvertIfRtl = invert;
|
|
}
|
|
|
|
public int getCellContentHeight() {
|
|
return Math.min(getMeasuredHeight(),
|
|
mActivity.getDeviceProfile().getCellContentHeight(mContainerType));
|
|
}
|
|
|
|
public void measureChild(View child) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
final DeviceProfile dp = mActivity.getDeviceProfile();
|
|
|
|
if (child instanceof NavigableAppWidgetHostView) {
|
|
((NavigableAppWidgetHostView) child).getWidgetInset(dp, mTempRect);
|
|
lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
|
|
dp.appWidgetScale.x, dp.appWidgetScale.y, mBorderSpacing, mTempRect);
|
|
} else {
|
|
lp.setup(mCellWidth, mCellHeight, invertLayoutHorizontally(), mCountX, mCountY,
|
|
mBorderSpacing, null);
|
|
// Center the icon/folder
|
|
int cHeight = getCellContentHeight();
|
|
int cellPaddingY = dp.isScalableGrid && mContainerType == WORKSPACE
|
|
? dp.cellYPaddingPx
|
|
: (int) Math.max(0, ((lp.height - cHeight) / 2f));
|
|
|
|
// No need to add padding when cell layout border spacing is present.
|
|
boolean noPaddingX = (dp.cellLayoutBorderSpacingPx > 0 && mContainerType == WORKSPACE)
|
|
|| (dp.folderCellLayoutBorderSpacingPx > 0 && mContainerType == FOLDER);
|
|
int cellPaddingX = noPaddingX
|
|
? 0
|
|
: mContainerType == WORKSPACE
|
|
? dp.workspaceCellPaddingXPx
|
|
: (int) (dp.edgeMarginPx / 2f);
|
|
child.setPadding(cellPaddingX, cellPaddingY, cellPaddingX, 0);
|
|
}
|
|
int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
|
|
int childheightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
|
|
child.measure(childWidthMeasureSpec, childheightMeasureSpec);
|
|
}
|
|
|
|
public boolean invertLayoutHorizontally() {
|
|
return mInvertIfRtl && Utilities.isRtl(getResources());
|
|
}
|
|
|
|
@Override
|
|
protected void onLayout(boolean changed, int l, int t, int r, int b) {
|
|
int count = getChildCount();
|
|
for (int i = 0; i < count; i++) {
|
|
final View child = getChildAt(i);
|
|
if (child.getVisibility() != GONE) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
layoutChild(child);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Core logic to layout a child for this ViewGroup.
|
|
*/
|
|
public void layoutChild(View child) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
if (child instanceof NavigableAppWidgetHostView) {
|
|
NavigableAppWidgetHostView nahv = (NavigableAppWidgetHostView) child;
|
|
|
|
// Scale and center the widget to fit within its cells.
|
|
DeviceProfile profile = mActivity.getDeviceProfile();
|
|
float scaleX = profile.appWidgetScale.x;
|
|
float scaleY = profile.appWidgetScale.y;
|
|
|
|
nahv.setScaleToFit(Math.min(scaleX, scaleY));
|
|
nahv.setTranslationForCentering(-(lp.width - (lp.width * scaleX)) / 2.0f,
|
|
-(lp.height - (lp.height * scaleY)) / 2.0f);
|
|
}
|
|
|
|
int childLeft = lp.x;
|
|
int childTop = lp.y;
|
|
child.layout(childLeft, childTop, childLeft + lp.width, childTop + lp.height);
|
|
|
|
if (lp.dropped) {
|
|
lp.dropped = false;
|
|
|
|
final int[] cellXY = mTmpCellXY;
|
|
getLocationOnScreen(cellXY);
|
|
mWallpaperManager.sendWallpaperCommand(getWindowToken(),
|
|
WallpaperManager.COMMAND_DROP,
|
|
cellXY[0] + childLeft + lp.width / 2,
|
|
cellXY[1] + childTop + lp.height / 2, 0, null);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
public boolean onInterceptTouchEvent(MotionEvent ev) {
|
|
if (ev.getAction() == ACTION_DOWN && getAlpha() == 0) {
|
|
// Dont let children handle touch, if we are not visible.
|
|
return true;
|
|
}
|
|
return super.onInterceptTouchEvent(ev);
|
|
}
|
|
|
|
@Override
|
|
public boolean shouldDelayChildPressedState() {
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public void requestChildFocus(View child, View focused) {
|
|
super.requestChildFocus(child, focused);
|
|
if (child != null) {
|
|
Rect r = new Rect();
|
|
child.getDrawingRect(r);
|
|
requestRectangleOnScreen(r);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void cancelLongPress() {
|
|
super.cancelLongPress();
|
|
|
|
// Cancel long press for all children
|
|
final int count = getChildCount();
|
|
for (int i = 0; i < count; i++) {
|
|
final View child = getChildAt(i);
|
|
child.cancelLongPress();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void drawFolderLeaveBehindForIcon(FolderIcon child) {
|
|
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
|
|
// While the folder is open, the position of the icon cannot change.
|
|
lp.canReorder = false;
|
|
if (mContainerType == CellLayout.HOTSEAT) {
|
|
CellLayout cl = (CellLayout) getParent();
|
|
cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void clearFolderLeaveBehind(FolderIcon child) {
|
|
((CellLayout.LayoutParams) child.getLayoutParams()).canReorder = true;
|
|
if (mContainerType == CellLayout.HOTSEAT) {
|
|
CellLayout cl = (CellLayout) getParent();
|
|
cl.clearFolderLeaveBehind();
|
|
}
|
|
}
|
|
}
|