Tony Wickham
ee82b035db
- Remove "|| true" that I accidentally left in from testing on a different CL - Always reverse system shortcut icons that appear in the header of the ShortcutsItemView, so they are in priority order from right to left Bug: 35766387 Change-Id: Ia7ac5a72eb2f6d3795e35bd044c426ef46fc0ccc
228 lines
9.5 KiB
Java
228 lines
9.5 KiB
Java
/*
|
|
* Copyright (C) 2017 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.shortcuts;
|
|
|
|
import android.animation.Animator;
|
|
import android.animation.AnimatorSet;
|
|
import android.content.Context;
|
|
import android.graphics.Point;
|
|
import android.util.AttributeSet;
|
|
import android.view.MotionEvent;
|
|
import android.view.View;
|
|
import android.widget.LinearLayout;
|
|
|
|
import com.android.launcher3.AbstractFloatingView;
|
|
import com.android.launcher3.ItemInfo;
|
|
import com.android.launcher3.Launcher;
|
|
import com.android.launcher3.LauncherAnimUtils;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.anim.PropertyListBuilder;
|
|
import com.android.launcher3.dragndrop.DragOptions;
|
|
import com.android.launcher3.dragndrop.DragView;
|
|
import com.android.launcher3.logging.UserEventDispatcher.LogContainerProvider;
|
|
import com.android.launcher3.popup.PopupContainerWithArrow;
|
|
import com.android.launcher3.popup.PopupItemView;
|
|
import com.android.launcher3.popup.PopupPopulator;
|
|
import com.android.launcher3.popup.SystemShortcut;
|
|
import com.android.launcher3.userevent.nano.LauncherLogProto;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* A {@link PopupItemView} that contains all of the {@link DeepShortcutView}s for an app,
|
|
* as well as the system shortcuts such as Widgets and App Info.
|
|
*/
|
|
public class ShortcutsItemView extends PopupItemView implements View.OnLongClickListener,
|
|
View.OnTouchListener, LogContainerProvider {
|
|
|
|
private Launcher mLauncher;
|
|
private LinearLayout mShortcutsLayout;
|
|
private LinearLayout mSystemShortcutIcons;
|
|
private final Point mIconShift = new Point();
|
|
private final Point mIconLastTouchPos = new Point();
|
|
private final List<DeepShortcutView> mDeepShortcutViews = new ArrayList<>();
|
|
private final List<View> mSystemShortcutViews = new ArrayList<>();
|
|
|
|
public ShortcutsItemView(Context context) {
|
|
this(context, null, 0);
|
|
}
|
|
|
|
public ShortcutsItemView(Context context, AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public ShortcutsItemView(Context context, AttributeSet attrs, int defStyle) {
|
|
super(context, attrs, defStyle);
|
|
|
|
mLauncher = Launcher.getLauncher(context);
|
|
}
|
|
|
|
@Override
|
|
protected void onFinishInflate() {
|
|
super.onFinishInflate();
|
|
mShortcutsLayout = findViewById(R.id.deep_shortcuts);
|
|
}
|
|
|
|
@Override
|
|
public boolean onTouch(View v, MotionEvent ev) {
|
|
// Touched a shortcut, update where it was touched so we can drag from there on long click.
|
|
switch (ev.getAction()) {
|
|
case MotionEvent.ACTION_DOWN:
|
|
case MotionEvent.ACTION_MOVE:
|
|
mIconLastTouchPos.set((int) ev.getX(), (int) ev.getY());
|
|
break;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public boolean onLongClick(View v) {
|
|
// Return early if this is not initiated from a touch or not the correct view
|
|
if (!v.isInTouchMode() || !(v.getParent() instanceof DeepShortcutView)) return false;
|
|
// Return early if global dragging is not enabled
|
|
if (!mLauncher.isDraggingEnabled()) return false;
|
|
// Return early if an item is already being dragged (e.g. when long-pressing two shortcuts)
|
|
if (mLauncher.getDragController().isDragging()) return false;
|
|
|
|
// Long clicked on a shortcut.
|
|
DeepShortcutView sv = (DeepShortcutView) v.getParent();
|
|
sv.setWillDrawIcon(false);
|
|
|
|
// Move the icon to align with the center-top of the touch point
|
|
mIconShift.x = mIconLastTouchPos.x - sv.getIconCenter().x;
|
|
mIconShift.y = mIconLastTouchPos.y - mLauncher.getDeviceProfile().iconSizePx;
|
|
|
|
DragView dv = mLauncher.getWorkspace().beginDragShared(sv.getBubbleText(),
|
|
(PopupContainerWithArrow) getParent(), sv.getFinalInfo(),
|
|
new ShortcutDragPreviewProvider(sv.getIconView(), mIconShift), new DragOptions());
|
|
dv.animateShift(-mIconShift.x, -mIconShift.y);
|
|
|
|
// TODO: support dragging from within folder without having to close it
|
|
AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_FOLDER);
|
|
return false;
|
|
}
|
|
|
|
public void addShortcutView(View shortcutView, PopupPopulator.Item shortcutType) {
|
|
if (shortcutType == PopupPopulator.Item.SHORTCUT) {
|
|
mDeepShortcutViews.add((DeepShortcutView) shortcutView);
|
|
} else {
|
|
mSystemShortcutViews.add(shortcutView);
|
|
}
|
|
if (shortcutType == PopupPopulator.Item.SYSTEM_SHORTCUT_ICON) {
|
|
// System shortcut icons are added to a header that is separate from the full shortcuts.
|
|
if (mSystemShortcutIcons == null) {
|
|
mSystemShortcutIcons = (LinearLayout) mLauncher.getLayoutInflater().inflate(
|
|
R.layout.system_shortcut_icons, mShortcutsLayout, false);
|
|
mShortcutsLayout.addView(mSystemShortcutIcons, 0);
|
|
}
|
|
mSystemShortcutIcons.addView(shortcutView);
|
|
} else {
|
|
if (mShortcutsLayout.getChildCount() > 0) {
|
|
View prevChild = mShortcutsLayout.getChildAt(mShortcutsLayout.getChildCount() - 1);
|
|
if (prevChild instanceof DeepShortcutView) {
|
|
prevChild.findViewById(R.id.divider).setVisibility(VISIBLE);
|
|
}
|
|
}
|
|
mShortcutsLayout.addView(shortcutView);
|
|
}
|
|
}
|
|
|
|
public List<DeepShortcutView> getDeepShortcutViews(boolean reverseOrder) {
|
|
if (reverseOrder) {
|
|
Collections.reverse(mDeepShortcutViews);
|
|
}
|
|
return mDeepShortcutViews;
|
|
}
|
|
|
|
public List<View> getSystemShortcutViews(boolean reverseOrder) {
|
|
// Always reverse system shortcut icons (in the header)
|
|
// so they are in priority order from right to left.
|
|
if (reverseOrder || mSystemShortcutIcons != null) {
|
|
Collections.reverse(mSystemShortcutViews);
|
|
}
|
|
return mSystemShortcutViews;
|
|
}
|
|
|
|
/**
|
|
* Sets the onClickListener on widgets system shortcut child, and updates alpha to 1.
|
|
* @return whether widgets is enabled, i.e. the onClickListener is not null.
|
|
*/
|
|
public boolean enableWidgets(ItemInfo itemInfo) {
|
|
for (View systemShortcut : mSystemShortcutViews) {
|
|
if (systemShortcut.getTag() instanceof SystemShortcut.Widgets) {
|
|
View.OnClickListener onClickListener =
|
|
((SystemShortcut.Widgets) systemShortcut.getTag()).getOnClickListener(
|
|
mLauncher, itemInfo);
|
|
if (onClickListener != null) {
|
|
systemShortcut.setAlpha(1f);
|
|
systemShortcut.setOnClickListener(onClickListener);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@Override
|
|
public Animator createOpenAnimation(boolean isContainerAboveIcon, boolean pivotLeft) {
|
|
AnimatorSet openAnimation = LauncherAnimUtils.createAnimatorSet();
|
|
openAnimation.play(super.createOpenAnimation(isContainerAboveIcon, pivotLeft));
|
|
for (int i = 0; i < mShortcutsLayout.getChildCount(); i++) {
|
|
if (!(mShortcutsLayout.getChildAt(i) instanceof DeepShortcutView)) {
|
|
continue;
|
|
}
|
|
DeepShortcutView shortcutView = ((DeepShortcutView) mShortcutsLayout.getChildAt(i));
|
|
View deepShortcutIcon = shortcutView.getIconView();
|
|
deepShortcutIcon.setScaleX(0);
|
|
deepShortcutIcon.setScaleY(0);
|
|
openAnimation.play(LauncherAnimUtils.ofPropertyValuesHolder(
|
|
deepShortcutIcon, new PropertyListBuilder().scale(1).build()));
|
|
}
|
|
return openAnimation;
|
|
}
|
|
|
|
@Override
|
|
public Animator createCloseAnimation(boolean isContainerAboveIcon, boolean pivotLeft,
|
|
long duration) {
|
|
AnimatorSet closeAnimation = LauncherAnimUtils.createAnimatorSet();
|
|
closeAnimation.play(super.createCloseAnimation(isContainerAboveIcon, pivotLeft, duration));
|
|
for (int i = 0; i < mShortcutsLayout.getChildCount(); i++) {
|
|
if (!(mShortcutsLayout.getChildAt(i) instanceof DeepShortcutView)) {
|
|
continue;
|
|
}
|
|
DeepShortcutView shortcutView = ((DeepShortcutView) mShortcutsLayout.getChildAt(i));
|
|
View deepShortcutIcon = shortcutView.getIconView();
|
|
deepShortcutIcon.setScaleX(1);
|
|
deepShortcutIcon.setScaleY(1);
|
|
closeAnimation.play(LauncherAnimUtils.ofPropertyValuesHolder(
|
|
deepShortcutIcon, new PropertyListBuilder().scale(0).build()));
|
|
}
|
|
return closeAnimation;
|
|
}
|
|
|
|
@Override
|
|
public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target,
|
|
LauncherLogProto.Target targetParent) {
|
|
target.itemType = LauncherLogProto.ItemType.DEEPSHORTCUT;
|
|
target.rank = info.rank;
|
|
targetParent.containerType = LauncherLogProto.ContainerType.DEEPSHORTCUTS;
|
|
}
|
|
}
|