aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing layout handling in DeviceProfile and moving it to

Browse Source 
individual views

Bug: 71709920
Change-Id: I8300fa7a84b31898bdb135d774cca576d2928525
This commit is contained in:
Sunny Goyal
2018-01-08 14:19:34 -08:00
parent 228153d92a
commit 07b6929cd9
19 changed files with 228 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/com/android/launcher3/DropTargetBar.java
View File

@@ -21,15 +21,19 @@ import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessib
import android.animation.TimeInterpolator;
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.view.ViewDebug;
import android.view.ViewGroup;
import android.view.ViewPropertyAnimator;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.dragndrop.DragController;
import com.android.launcher3.dragndrop.DragController.DragListener;
import com.android.launcher3.dragndrop.DragOptions;
import java.util.ArrayList;
@@ -37,18 +41,14 @@ import java.util.ArrayList;
/*
* The top bar containing various drop targets: Delete/App Info/Uninstall.
*/
public class DropTargetBar extends LinearLayout implements DragController.DragListener {
public class DropTargetBar extends LinearLayout
implements DragListener, Insettable {
protected static final int DEFAULT_DRAG_FADE_DURATION = 175;
protected static final TimeInterpolator DEFAULT_INTERPOLATOR = Interpolators.ACCEL;
private final Runnable mFadeAnimationEndRunnable = new Runnable() {
@Override
public void run() {
updateVisibility(DropTargetBar.this, isAccessibilityEnabled(getContext()));
}
};
private final Runnable mFadeAnimationEndRunnable =
() -> updateVisibility(DropTargetBar.this, isAccessibilityEnabled(getContext()));
@ViewDebug.ExportedProperty(category = "launcher")
protected boolean mDeferOnDragEnd;
@@ -75,6 +75,40 @@ public class DropTargetBar extends LinearLayout implements DragController.DragLi
setAlpha(0f);
}
@Override
public void setInsets(Rect insets) {
FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile();
lp.leftMargin = insets.left;
lp.topMargin = insets.top;
lp.bottomMargin = insets.bottom;
lp.rightMargin = insets.right;
if (grid.isVerticalBarLayout()) {
lp.width = grid.dropTargetBarSizePx;
lp.height = grid.availableHeightPx - 2 * grid.edgeMarginPx;
lp.gravity = insets.left > insets.right ? Gravity.RIGHT : Gravity.LEFT;
} else {
int gap;
if (grid.isTablet) {
// XXX: If the icon size changes across orientations, we will have to take
// that into account here too.
gap = ((grid.widthPx - 2 * grid.edgeMarginPx
- (grid.inv.numColumns * grid.cellWidthPx))
/ (2 * (grid.inv.numColumns + 1)))
+ grid.edgeMarginPx;
} else {
gap = grid.desiredWorkspaceLeftRightMarginPx - grid.defaultWidgetPadding.right;
}
lp.width = grid.availableWidthPx - 2 * gap;
lp.topMargin += grid.edgeMarginPx;
lp.height = grid.dropTargetBarSizePx;
}
setLayoutParams(lp);
}
public void setup(DragController dragController) {
dragController.addDragListener(this);
ArrayList<ButtonDropTarget> outList = new ArrayList<>();