Merge "Import translations. DO NOT MERGE" into ub-launcher3-master
diff --git a/res/layout/app_widget_resize_frame.xml b/res/layout/app_widget_resize_frame.xml
new file mode 100644
index 0000000..91a1e45
--- /dev/null
+++ b/res/layout/app_widget_resize_frame.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<com.android.launcher3.AppWidgetResizeFrame
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/widget_resize_shadow"
+ android:foreground="@drawable/widget_resize_frame"
+ android:padding="0dp" >
+
+ <!-- Left -->
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_widget_resize_handle"
+ android:layout_gravity="left|center_vertical"
+ android:layout_marginLeft="@dimen/widget_handle_margin" />
+
+ <!-- Top -->
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_widget_resize_handle"
+ android:layout_gravity="top|center_horizontal"
+ android:layout_marginTop="@dimen/widget_handle_margin" />
+
+ <!-- Right -->
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_widget_resize_handle"
+ android:layout_gravity="right|center_vertical"
+ android:layout_marginRight="@dimen/widget_handle_margin" />
+
+ <!-- Bottom -->
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_widget_resize_handle"
+ android:layout_gravity="bottom|center_horizontal"
+ android:layout_marginBottom="@dimen/widget_handle_margin" />
+
+</com.android.launcher3.AppWidgetResizeFrame>
\ No newline at end of file
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 50bd896..da2a861 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -26,9 +26,9 @@
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
- android:paddingTop="4dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="6dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -51,8 +51,8 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
- android:paddingBottom="@dimen/folder_label_padding"
- android:paddingTop="@dimen/folder_label_padding"
+ android:paddingBottom="@dimen/folder_label_padding_bottom"
+ android:paddingTop="@dimen/folder_label_padding_top"
android:singleLine="true"
android:textColor="#ff777777"
android:includeFontPadding="false"
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index 16e618a..a8af201 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -26,9 +26,9 @@
android:id="@+id/folder_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
- android:paddingTop="4dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="6dp"
launcher:pageIndicator="@+id/folder_page_indicator" />
<LinearLayout
@@ -52,8 +52,8 @@
android:gravity="center_horizontal"
android:hint="@string/folder_hint_text"
android:imeOptions="flagNoExtractUi"
- android:paddingBottom="@dimen/folder_label_padding"
- android:paddingTop="@dimen/folder_label_padding"
+ android:paddingBottom="@dimen/folder_label_padding_bottom"
+ android:paddingTop="@dimen/folder_label_padding_top"
android:singleLine="true"
android:textColor="#EE777777"
android:textColorHighlight="#ffCCCCCC"
diff --git a/res/values/config.xml b/res/values/config.xml
index a942f02..5b3ee46 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -91,6 +91,9 @@
<!-- View ID used by cell layout to jail its content -->
<item type="id" name="cell_layout_jail_id" />
+ <!-- View ID used by PreviewImageView to cache its instance -->
+ <item type="id" name="preview_image_id" />
+
<!-- Deep shortcuts -->
<integer name="config_deepShortcutOpenDuration">220</integer>
<integer name="config_deepShortcutArrowOpenDuration">80</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 12e902a..0616915 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -138,9 +138,10 @@
<dimen name="page_indicator_dot_size">8dp</dimen>
<dimen name="folder_cell_x_padding">9dp</dimen>
- <dimen name="folder_cell_y_padding">8dp</dimen>
+ <dimen name="folder_cell_y_padding">6dp</dimen>
<dimen name="folder_child_text_size">13sp</dimen>
- <dimen name="folder_label_padding">12dp</dimen>
+ <dimen name="folder_label_padding_top">4dp</dimen>
+ <dimen name="folder_label_padding_bottom">12dp</dimen>
<dimen name="folder_label_text_size">14sp</dimen>
<!-- Sizes for managed profile badges -->
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java
new file mode 100644
index 0000000..65da002
--- /dev/null
+++ b/src/com/android/launcher3/AbstractFloatingView.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2016 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 android.content.Context;
+import android.support.annotation.IntDef;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.android.launcher3.dragndrop.DragLayer;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Base class for a View which shows a floating UI on top of the launcher UI.
+ */
+public abstract class AbstractFloatingView extends LinearLayout {
+
+ @IntDef(flag = true, value = {TYPE_FOLDER, TYPE_DEEPSHORTCUT_CONTAINER})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface FloatingViewType {}
+ public static final int TYPE_FOLDER = 1 << 0;
+ public static final int TYPE_DEEPSHORTCUT_CONTAINER = 1 << 1;
+
+ protected boolean mIsOpen;
+
+ public AbstractFloatingView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public AbstractFloatingView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public final void close(boolean animate) {
+ animate &= !Utilities.isPowerSaverOn(getContext());
+ handleClose(animate);
+ Launcher.getLauncher(getContext()).getUserEventDispatcher().resetElapsedContainerMillis();
+ }
+
+ protected abstract void handleClose(boolean animate);
+
+ /**
+ * If the view is current handling keyboard, return the active target, null otherwise
+ */
+ public ExtendedEditText getActiveTextView() {
+ return null;
+ }
+
+
+ /**
+ * Any additional view (outside of this container) where touch should be allowed while this
+ * view is visible.
+ */
+ public View getExtendedTouchView() {
+ return null;
+ }
+
+ public final boolean isOpen() {
+ return mIsOpen;
+ }
+
+ protected abstract boolean isOfType(@FloatingViewType int type);
+
+ protected static <T extends AbstractFloatingView> T getOpenView(
+ Launcher launcher, @FloatingViewType int type) {
+ DragLayer dragLayer = launcher.getDragLayer();
+ // Iterate in reverse order. AbstractFloatingView is added later to the dragLayer,
+ // and will be one of the last views.
+ for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
+ View child = dragLayer.getChildAt(i);
+ if (child instanceof AbstractFloatingView) {
+ AbstractFloatingView view = (AbstractFloatingView) child;
+ if (view.isOfType(type) && view.isOpen()) {
+ return (T) view;
+ }
+ }
+ }
+ return null;
+ }
+
+ protected static void closeOpenContainer(Launcher launcher, @FloatingViewType int type) {
+ AbstractFloatingView view = getOpenView(launcher, type);
+ if (view != null) {
+ view.close(true);
+ }
+ }
+
+ public static void closeAllOpenViews(Launcher launcher, boolean animate) {
+ DragLayer dragLayer = launcher.getDragLayer();
+ // Iterate in reverse order. AbstractFloatingView is added later to the dragLayer,
+ // and will be one of the last views.
+ for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
+ View child = dragLayer.getChildAt(i);
+ if (child instanceof AbstractFloatingView) {
+ ((AbstractFloatingView) child).close(animate);
+ }
+ }
+ }
+
+ public static void closeAllOpenViews(Launcher launcher) {
+ closeAllOpenViews(launcher, true);
+ }
+
+ public static AbstractFloatingView getTopOpenView(Launcher launcher) {
+ return getOpenView(launcher, TYPE_FOLDER | TYPE_DEEPSHORTCUT_CONTAINER);
+ }
+}
diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java
index c427ddc..0e465a4 100644
--- a/src/com/android/launcher3/AllAppsList.java
+++ b/src/com/android/launcher3/AllAppsList.java
@@ -33,7 +33,7 @@
/**
* Stores the list of all applications for the all apps view.
*/
-class AllAppsList {
+public class AllAppsList {
public static final int DEFAULT_APPLICATIONS_NUMBER = 42;
/** The list off all apps. */
@@ -112,8 +112,7 @@
final List<AppInfo> data = this.data;
for (int i = data.size() - 1; i >= 0; i--) {
AppInfo info = data.get(i);
- final ComponentName component = info.intent.getComponent();
- if (info.user.equals(user) && packageName.equals(component.getPackageName())) {
+ if (info.user.equals(user) && packageName.equals(info.componentName.getPackageName())) {
removed.add(info);
data.remove(i);
}
@@ -127,7 +126,7 @@
final List<AppInfo> data = this.data;
for (int i = data.size() - 1; i >= 0; i--) {
AppInfo info = data.get(i);
- if (matcher.matches(info, info.intent.getComponent())) {
+ if (matcher.matches(info, info.componentName)) {
info.isDisabled = op.apply(info.isDisabled);
modified.add(info);
}
diff --git a/src/com/android/launcher3/AppInfo.java b/src/com/android/launcher3/AppInfo.java
index 4c4d67c..3b22f46 100644
--- a/src/com/android/launcher3/AppInfo.java
+++ b/src/com/android/launcher3/AppInfo.java
@@ -52,11 +52,6 @@
public ComponentName componentName;
- static final int DOWNLOADED_FLAG = 1;
- static final int UPDATED_SYSTEM_APP_FLAG = 2;
-
- int flags = 0;
-
/**
* {@see ShortcutInfo#isDisabled}
*/
@@ -88,7 +83,6 @@
IconCache iconCache, boolean quietModeEnabled) {
this.componentName = info.getComponentName();
this.container = ItemInfo.NO_ID;
- flags = initFlags(info);
if (PackageManagerHelper.isAppSuspended(info.getApplicationInfo())) {
isDisabled |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;
}
@@ -101,25 +95,11 @@
this.user = user;
}
- public static int initFlags(LauncherActivityInfoCompat info) {
- int appFlags = info.getApplicationInfo().flags;
- int flags = 0;
- if ((appFlags & android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) {
- flags |= DOWNLOADED_FLAG;
-
- if ((appFlags & android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
- flags |= UPDATED_SYSTEM_APP_FLAG;
- }
- }
- return flags;
- }
-
public AppInfo(AppInfo info) {
super(info);
componentName = info.componentName;
title = Utilities.trim(info.title);
intent = new Intent(info.intent);
- flags = info.flags;
isDisabled = info.isDisabled;
iconBitmap = info.iconBitmap;
}
diff --git a/src/com/android/launcher3/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
index f0ec503..d00d5dd 100644
--- a/src/com/android/launcher3/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -1,7 +1,5 @@
package com.android.launcher3;
-import com.android.launcher3.dragndrop.DragLayer;
-
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
@@ -13,14 +11,14 @@
import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.Rect;
-import android.view.Gravity;
+import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.widget.FrameLayout;
-import android.widget.ImageView;
import com.android.launcher3.accessibility.DragViewStateAnnouncer;
+import com.android.launcher3.dragndrop.DragLayer;
import com.android.launcher3.util.FocusLogic;
import com.android.launcher3.util.TouchController;
@@ -35,17 +33,22 @@
// Represents the cell size on the grid in the two orientations.
private static Point[] sCellSize;
+ private static final int HANDLE_COUNT = 4;
+ private static final int INDEX_LEFT = 0;
+ private static final int INDEX_TOP = 1;
+ private static final int INDEX_RIGHT = 2;
+ private static final int INDEX_BOTTOM = 3;
+
private final Launcher mLauncher;
- private final LauncherAppWidgetHostView mWidgetView;
- private final CellLayout mCellLayout;
- private final DragLayer mDragLayer;
+ private final DragViewStateAnnouncer mStateAnnouncer;
- private final ImageView mLeftHandle;
- private final ImageView mRightHandle;
- private final ImageView mTopHandle;
- private final ImageView mBottomHandle;
+ private final View[] mDragHandles = new View[HANDLE_COUNT];
- private final Rect mWidgetPadding;
+ private LauncherAppWidgetHostView mWidgetView;
+ private CellLayout mCellLayout;
+ private DragLayer mDragLayer;
+
+ private Rect mWidgetPadding;
private final int mBackgroundPadding;
private final int mTouchTargetWidth;
@@ -54,17 +57,20 @@
private final int[] mLastDirectionVector = new int[2];
private final int[] mTmpPt = new int[2];
- private final DragViewStateAnnouncer mStateAnnouncer;
+ private final IntRange mTempRange1 = new IntRange();
+ private final IntRange mTempRange2 = new IntRange();
+
+ private final IntRange mDeltaXRange = new IntRange();
+ private final IntRange mBaselineX = new IntRange();
+
+ private final IntRange mDeltaYRange = new IntRange();
+ private final IntRange mBaselineY = new IntRange();
private boolean mLeftBorderActive;
private boolean mRightBorderActive;
private boolean mTopBorderActive;
private boolean mBottomBorderActive;
- private int mBaselineWidth;
- private int mBaselineHeight;
- private int mBaselineX;
- private int mBaselineY;
private int mResizeMode;
private int mRunningHInc;
@@ -81,11 +87,36 @@
private int mXDown, mYDown;
- public AppWidgetResizeFrame(Context context,
- LauncherAppWidgetHostView widgetView, CellLayout cellLayout, DragLayer dragLayer) {
+ public AppWidgetResizeFrame(Context context) {
+ this(context, null);
+ }
- super(context);
- mLauncher = (Launcher) context;
+ public AppWidgetResizeFrame(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public AppWidgetResizeFrame(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+
+ mLauncher = Launcher.getLauncher(context);
+ mStateAnnouncer = DragViewStateAnnouncer.createFor(this);
+
+ mBackgroundPadding = getResources()
+ .getDimensionPixelSize(R.dimen.resize_frame_background_padding);
+ mTouchTargetWidth = 2 * mBackgroundPadding;
+ }
+
+ @Override
+ protected void onFinishInflate() {
+ super.onFinishInflate();
+
+ for (int i = 0; i < HANDLE_COUNT; i ++) {
+ mDragHandles[i] = getChildAt(i);
+ }
+ }
+
+ public void setupForWidget(LauncherAppWidgetHostView widgetView, CellLayout cellLayout,
+ DragLayer dragLayer) {
mCellLayout = cellLayout;
mWidgetView = widgetView;
LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo)
@@ -96,63 +127,23 @@
mMinHSpan = info.minSpanX;
mMinVSpan = info.minSpanY;
- mStateAnnouncer = DragViewStateAnnouncer.createFor(this);
-
- setBackgroundResource(R.drawable.widget_resize_shadow);
- setForeground(getResources().getDrawable(R.drawable.widget_resize_frame));
- setPadding(0, 0, 0, 0);
-
- final int handleMargin = getResources().getDimensionPixelSize(R.dimen.widget_handle_margin);
- LayoutParams lp;
- mLeftHandle = new ImageView(context);
- mLeftHandle.setImageResource(R.drawable.ic_widget_resize_handle);
- lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.LEFT | Gravity.CENTER_VERTICAL);
- lp.leftMargin = handleMargin;
- addView(mLeftHandle, lp);
-
- mRightHandle = new ImageView(context);
- mRightHandle.setImageResource(R.drawable.ic_widget_resize_handle);
- lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.RIGHT | Gravity.CENTER_VERTICAL);
- lp.rightMargin = handleMargin;
- addView(mRightHandle, lp);
-
- mTopHandle = new ImageView(context);
- mTopHandle.setImageResource(R.drawable.ic_widget_resize_handle);
- lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_HORIZONTAL | Gravity.TOP);
- lp.topMargin = handleMargin;
- addView(mTopHandle, lp);
-
- mBottomHandle = new ImageView(context);
- mBottomHandle.setImageResource(R.drawable.ic_widget_resize_handle);
- lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
- lp.bottomMargin = handleMargin;
- addView(mBottomHandle, lp);
-
if (!info.isCustomWidget) {
- mWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context,
+ mWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(getContext(),
widgetView.getAppWidgetInfo().provider, null);
} else {
- Resources r = context.getResources();
+ Resources r = getContext().getResources();
int padding = r.getDimensionPixelSize(R.dimen.default_widget_padding);
mWidgetPadding = new Rect(padding, padding, padding, padding);
}
if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
- mTopHandle.setVisibility(GONE);
- mBottomHandle.setVisibility(GONE);
+ mDragHandles[INDEX_TOP].setVisibility(GONE);
+ mDragHandles[INDEX_BOTTOM].setVisibility(GONE);
} else if (mResizeMode == AppWidgetProviderInfo.RESIZE_VERTICAL) {
- mLeftHandle.setVisibility(GONE);
- mRightHandle.setVisibility(GONE);
+ mDragHandles[INDEX_LEFT].setVisibility(GONE);
+ mDragHandles[INDEX_RIGHT].setVisibility(GONE);
}
- mBackgroundPadding = getResources()
- .getDimensionPixelSize(R.dimen.resize_frame_background_padding);
- mTouchTargetWidth = 2 * mBackgroundPadding;
-
// When we create the resize frame, we first mark all cells as unoccupied. The appropriate
// cells (same if not resized, or different) will be marked as occupied when the resize
// frame is dismissed.
@@ -174,101 +165,74 @@
boolean anyBordersActive = mLeftBorderActive || mRightBorderActive
|| mTopBorderActive || mBottomBorderActive;
- mBaselineWidth = getMeasuredWidth();
- mBaselineHeight = getMeasuredHeight();
- mBaselineX = getLeft();
- mBaselineY = getTop();
-
if (anyBordersActive) {
- mLeftHandle.setAlpha(mLeftBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
- mRightHandle.setAlpha(mRightBorderActive ? 1.0f :DIMMED_HANDLE_ALPHA);
- mTopHandle.setAlpha(mTopBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
- mBottomHandle.setAlpha(mBottomBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
+ mDragHandles[INDEX_LEFT].setAlpha(mLeftBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
+ mDragHandles[INDEX_RIGHT].setAlpha(mRightBorderActive ? 1.0f :DIMMED_HANDLE_ALPHA);
+ mDragHandles[INDEX_TOP].setAlpha(mTopBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
+ mDragHandles[INDEX_BOTTOM].setAlpha(mBottomBorderActive ? 1.0f : DIMMED_HANDLE_ALPHA);
}
+
+ if (mLeftBorderActive) {
+ mDeltaXRange.set(-getLeft(), getWidth() - 2 * mTouchTargetWidth);
+ } else if (mRightBorderActive) {
+ mDeltaXRange.set(2 * mTouchTargetWidth - getWidth(), mDragLayer.getWidth() - getRight());
+ } else {
+ mDeltaXRange.set(0, 0);
+ }
+ mBaselineX.set(getLeft(), getRight());
+
+ if (mTopBorderActive) {
+ mDeltaYRange.set(-getTop(), getHeight() - 2 * mTouchTargetWidth);
+ } else if (mBottomBorderActive) {
+ mDeltaYRange.set(2 * mTouchTargetWidth - getHeight(), mDragLayer.getHeight() - getBottom());
+ } else {
+ mDeltaYRange.set(0, 0);
+ }
+ mBaselineY.set(getTop(), getBottom());
+
return anyBordersActive;
}
/**
- * Here we bound the deltas such that the frame cannot be stretched beyond the extents
- * of the CellLayout, and such that the frame's borders can't cross.
+ * Based on the deltas, we resize the frame.
*/
- public void updateDeltas(int deltaX, int deltaY) {
- if (mLeftBorderActive) {
- mDeltaX = Math.max(-mBaselineX, deltaX);
- mDeltaX = Math.min(mBaselineWidth - 2 * mTouchTargetWidth, mDeltaX);
- } else if (mRightBorderActive) {
- mDeltaX = Math.min(mDragLayer.getWidth() - (mBaselineX + mBaselineWidth), deltaX);
- mDeltaX = Math.max(-mBaselineWidth + 2 * mTouchTargetWidth, mDeltaX);
- }
+ public void visualizeResizeForDelta(int deltaX, int deltaY) {
+ mDeltaX = mDeltaXRange.clamp(deltaX);
+ mDeltaY = mDeltaYRange.clamp(deltaY);
- if (mTopBorderActive) {
- mDeltaY = Math.max(-mBaselineY, deltaY);
- mDeltaY = Math.min(mBaselineHeight - 2 * mTouchTargetWidth, mDeltaY);
- } else if (mBottomBorderActive) {
- mDeltaY = Math.min(mDragLayer.getHeight() - (mBaselineY + mBaselineHeight), deltaY);
- mDeltaY = Math.max(-mBaselineHeight + 2 * mTouchTargetWidth, mDeltaY);
- }
- }
-
- private void visualizeResizeForDelta(int deltaX, int deltaY) {
- visualizeResizeForDelta(deltaX, deltaY, false);
- }
-
- /**
- * Based on the deltas, we resize the frame, and, if needed, we resize the widget.
- */
- private void visualizeResizeForDelta(int deltaX, int deltaY, boolean onDismiss) {
- updateDeltas(deltaX, deltaY);
DragLayer.LayoutParams lp = (DragLayer.LayoutParams) getLayoutParams();
+ mDeltaX = mDeltaXRange.clamp(deltaX);
+ mBaselineX.applyDelta(mLeftBorderActive, mRightBorderActive, mDeltaX, mTempRange1);
+ lp.x = mTempRange1.start;
+ lp.width = mTempRange1.size();
- if (mLeftBorderActive) {
- lp.x = mBaselineX + mDeltaX;
- lp.width = mBaselineWidth - mDeltaX;
- } else if (mRightBorderActive) {
- lp.width = mBaselineWidth + mDeltaX;
- }
+ mDeltaY = mDeltaYRange.clamp(deltaY);
+ mBaselineY.applyDelta(mTopBorderActive, mBottomBorderActive, mDeltaY, mTempRange1);
+ lp.y = mTempRange1.start;
+ lp.height = mTempRange1.size();
- if (mTopBorderActive) {
- lp.y = mBaselineY + mDeltaY;
- lp.height = mBaselineHeight - mDeltaY;
- } else if (mBottomBorderActive) {
- lp.height = mBaselineHeight + mDeltaY;
- }
-
- resizeWidgetIfNeeded(onDismiss);
+ resizeWidgetIfNeeded(false);
requestLayout();
}
+ private static int getSpanIncrement(float deltaFrac) {
+ return Math.abs(deltaFrac) > RESIZE_THRESHOLD ? Math.round(deltaFrac) : 0;
+ }
+
/**
* Based on the current deltas, we determine if and how to resize the widget.
*/
private void resizeWidgetIfNeeded(boolean onDismiss) {
- int xThreshold = mCellLayout.getCellWidth() + mCellLayout.getWidthGap();
- int yThreshold = mCellLayout.getCellHeight() + mCellLayout.getHeightGap();
+ float xThreshold = mCellLayout.getCellWidth() + mCellLayout.getWidthGap();
+ float yThreshold = mCellLayout.getCellHeight() + mCellLayout.getHeightGap();
- int deltaX = mDeltaX + mDeltaXAddOn;
- int deltaY = mDeltaY + mDeltaYAddOn;
-
- float hSpanIncF = 1.0f * deltaX / xThreshold - mRunningHInc;
- float vSpanIncF = 1.0f * deltaY / yThreshold - mRunningVInc;
-
- int hSpanInc = 0;
- int vSpanInc = 0;
- int cellXInc = 0;
- int cellYInc = 0;
-
- int countX = mCellLayout.getCountX();
- int countY = mCellLayout.getCountY();
-
- if (Math.abs(hSpanIncF) > RESIZE_THRESHOLD) {
- hSpanInc = Math.round(hSpanIncF);
- }
- if (Math.abs(vSpanIncF) > RESIZE_THRESHOLD) {
- vSpanInc = Math.round(vSpanIncF);
- }
+ int hSpanInc = getSpanIncrement((mDeltaX + mDeltaXAddOn) / xThreshold - mRunningHInc);
+ int vSpanInc = getSpanIncrement((mDeltaY + mDeltaYAddOn) / yThreshold - mRunningVInc);
if (!onDismiss && (hSpanInc == 0 && vSpanInc == 0)) return;
+ mDirectionVector[0] = 0;
+ mDirectionVector[1] = 0;
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) mWidgetView.getLayoutParams();
@@ -277,55 +241,24 @@
int cellX = lp.useTmpCoords ? lp.tmpCellX : lp.cellX;
int cellY = lp.useTmpCoords ? lp.tmpCellY : lp.cellY;
- int hSpanDelta = 0;
- int vSpanDelta = 0;
-
// For each border, we bound the resizing based on the minimum width, and the maximum
// expandability.
- if (mLeftBorderActive) {
- cellXInc = Math.max(-cellX, hSpanInc);
- cellXInc = Math.min(lp.cellHSpan - mMinHSpan, cellXInc);
- hSpanInc *= -1;
- hSpanInc = Math.min(cellX, hSpanInc);
- hSpanInc = Math.max(-(lp.cellHSpan - mMinHSpan), hSpanInc);
- hSpanDelta = -hSpanInc;
-
- } else if (mRightBorderActive) {
- hSpanInc = Math.min(countX - (cellX + spanX), hSpanInc);
- hSpanInc = Math.max(-(lp.cellHSpan - mMinHSpan), hSpanInc);
- hSpanDelta = hSpanInc;
+ mTempRange1.set(cellX, spanX + cellX);
+ int hSpanDelta = mTempRange1.applyDeltaAndBound(mLeftBorderActive, mRightBorderActive,
+ hSpanInc, mMinHSpan, mCellLayout.getCountX(), mTempRange2);
+ cellX = mTempRange2.start;
+ spanX = mTempRange2.size();
+ if (hSpanDelta != 0) {
+ mDirectionVector[0] = mLeftBorderActive ? -1 : 1;
}
- if (mTopBorderActive) {
- cellYInc = Math.max(-cellY, vSpanInc);
- cellYInc = Math.min(lp.cellVSpan - mMinVSpan, cellYInc);
- vSpanInc *= -1;
- vSpanInc = Math.min(cellY, vSpanInc);
- vSpanInc = Math.max(-(lp.cellVSpan - mMinVSpan), vSpanInc);
- vSpanDelta = -vSpanInc;
- } else if (mBottomBorderActive) {
- vSpanInc = Math.min(countY - (cellY + spanY), vSpanInc);
- vSpanInc = Math.max(-(lp.cellVSpan - mMinVSpan), vSpanInc);
- vSpanDelta = vSpanInc;
- }
-
- mDirectionVector[0] = 0;
- mDirectionVector[1] = 0;
- // Update the widget's dimensions and position according to the deltas computed above
- if (mLeftBorderActive || mRightBorderActive) {
- spanX += hSpanInc;
- cellX += cellXInc;
- if (hSpanDelta != 0) {
- mDirectionVector[0] = mLeftBorderActive ? -1 : 1;
- }
- }
-
- if (mTopBorderActive || mBottomBorderActive) {
- spanY += vSpanInc;
- cellY += cellYInc;
- if (vSpanDelta != 0) {
- mDirectionVector[1] = mTopBorderActive ? -1 : 1;
- }
+ mTempRange1.set(cellY, spanY + cellY);
+ int vSpanDelta = mTempRange1.applyDeltaAndBound(mTopBorderActive, mBottomBorderActive,
+ vSpanInc, mMinVSpan, mCellLayout.getCountY(), mTempRange2);
+ cellY = mTempRange2.start;
+ spanY = mTempRange2.size();
+ if (vSpanDelta != 0) {
+ mDirectionVector[1] = mTopBorderActive ? -1 : 1;
}
if (!onDismiss && vSpanDelta == 0 && hSpanDelta == 0) return;
@@ -455,10 +388,9 @@
lp.height = newHeight;
lp.x = newX;
lp.y = newY;
- mLeftHandle.setAlpha(1.0f);
- mRightHandle.setAlpha(1.0f);
- mTopHandle.setAlpha(1.0f);
- mBottomHandle.setAlpha(1.0f);
+ for (int i = 0; i < HANDLE_COUNT; i++) {
+ mDragHandles[i].setAlpha(1.0f);
+ }
requestLayout();
} else {
PropertyValuesHolder width = PropertyValuesHolder.ofInt("width", lp.width, newWidth);
@@ -468,22 +400,15 @@
PropertyValuesHolder y = PropertyValuesHolder.ofInt("y", lp.y, newY);
ObjectAnimator oa =
LauncherAnimUtils.ofPropertyValuesHolder(lp, this, width, height, x, y);
- ObjectAnimator leftOa = LauncherAnimUtils.ofFloat(mLeftHandle, ALPHA, 1.0f);
- ObjectAnimator rightOa = LauncherAnimUtils.ofFloat(mRightHandle, ALPHA, 1.0f);
- ObjectAnimator topOa = LauncherAnimUtils.ofFloat(mTopHandle, ALPHA, 1.0f);
- ObjectAnimator bottomOa = LauncherAnimUtils.ofFloat(mBottomHandle, ALPHA, 1.0f);
oa.addUpdateListener(new AnimatorUpdateListener() {
public void onAnimationUpdate(ValueAnimator animation) {
requestLayout();
}
});
AnimatorSet set = LauncherAnimUtils.createAnimatorSet();
- if (mResizeMode == AppWidgetProviderInfo.RESIZE_VERTICAL) {
- set.playTogether(oa, topOa, bottomOa);
- } else if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {
- set.playTogether(oa, leftOa, rightOa);
- } else {
- set.playTogether(oa, leftOa, rightOa, topOa, bottomOa);
+ set.play(oa);
+ for (int i = 0; i < HANDLE_COUNT; i++) {
+ set.play(LauncherAnimUtils.ofFloat(mDragHandles[i], ALPHA, 1.0f));
}
set.setDuration(SNAP_DURATION);
@@ -550,4 +475,63 @@
}
return false;
}
+
+ /**
+ * A mutable class for describing the range of two int values.
+ */
+ private static class IntRange {
+
+ public int start, end;
+
+ public int clamp(int value) {
+ return Utilities.boundToRange(value, start, end);
+ }
+
+ public void set(int s, int e) {
+ start = s;
+ end = e;
+ }
+
+ public int size() {
+ return end - start;
+ }
+
+ /**
+ * Moves either the start or end edge (but never both) by {@param delta} and sets the
+ * result in {@param out}
+ */
+ public void applyDelta(boolean moveStart, boolean moveEnd, int delta, IntRange out) {
+ out.start = moveStart ? start + delta : start;
+ out.end = moveEnd ? end + delta : end;
+ }
+
+ /**
+ * Applies delta similar to {@link #applyDelta(boolean, boolean, int, IntRange)},
+ * with extra conditions.
+ * @param minSize minimum size after with the moving edge should not be shifted any further.
+ * For eg, if delta = -3 when moving the endEdge brings the size to less than
+ * minSize, only delta = -2 will applied
+ * @param maxEnd The maximum value to the end edge (start edge is always restricted to 0)
+ * @return the amount of increase when endEdge was moves and the amount of decrease when
+ * the start edge was moved.
+ */
+ public int applyDeltaAndBound(boolean moveStart, boolean moveEnd, int delta,
+ int minSize, int maxEnd, IntRange out) {
+ applyDelta(moveStart, moveEnd, delta, out);
+ if (start < 0) {
+ out.start = 0;
+ }
+ if (end > maxEnd) {
+ out.end = maxEnd;
+ }
+ if (out.size() < minSize) {
+ if (moveStart) {
+ out.start = out.end - minSize;
+ } else if (moveEnd) {
+ out.end = out.start + minSize;
+ }
+ }
+ return moveEnd ? out.size() - size() : size() - out.size();
+ }
+ }
}
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 8e4567b..e830250 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -284,7 +284,8 @@
Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_child_text_size));
final int folderBottomPanelSize =
- 2 * res.getDimensionPixelSize(R.dimen.folder_label_padding)
+ res.getDimensionPixelSize(R.dimen.folder_label_padding_top)
+ + res.getDimensionPixelSize(R.dimen.folder_label_padding_bottom)
+ Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_label_text_size));
// Don't let the folder get too close to the edges of the screen.
diff --git a/src/com/android/launcher3/DragSource.java b/src/com/android/launcher3/DragSource.java
index efbb9d7..2fb495f 100644
--- a/src/com/android/launcher3/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -19,12 +19,12 @@
import android.view.View;
import com.android.launcher3.DropTarget.DragObject;
-import com.android.launcher3.logging.UserEventDispatcher.LaunchSourceProvider;
+import com.android.launcher3.logging.UserEventDispatcher.LogContainerProvider;
/**
* Interface defining an object that can originate a drag.
*/
-public interface DragSource extends LaunchSourceProvider {
+public interface DragSource extends LogContainerProvider {
/**
* @return whether items dragged from this source supports
diff --git a/src/com/android/launcher3/ExtendedEditText.java b/src/com/android/launcher3/ExtendedEditText.java
index c06f727..d05673c 100644
--- a/src/com/android/launcher3/ExtendedEditText.java
+++ b/src/com/android/launcher3/ExtendedEditText.java
@@ -99,4 +99,12 @@
((InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE))
.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT);
}
+
+ public void dispatchBackKey() {
+ ((InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE))
+ .hideSoftInputFromWindow(getWindowToken(), 0);
+ if (mBackKeyListener != null) {
+ mBackKeyListener.onBackKey();
+ }
+ }
}
diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index c0a8caa..8b70d1c 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -45,11 +45,6 @@
*/
public static final int FLAG_MULTI_PAGE_ANIMATION = 0x00000004;
- /**
- * Whether this folder has been opened
- */
- public boolean opened;
-
public int options;
/**
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java
index f9424d4..11d6b50 100644
--- a/src/com/android/launcher3/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -42,7 +42,7 @@
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
public class Hotseat extends FrameLayout
- implements UserEventDispatcher.LaunchSourceProvider {
+ implements UserEventDispatcher.LogContainerProvider {
private CellLayout mContent;
@@ -172,7 +172,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
target.gridX = info.cellX;
target.gridY = info.cellY;
targetParent.containerType = LauncherLogProto.HOTSEAT;
diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 41f612c..661f99b 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -224,7 +224,7 @@
PackageManager.GET_UNINSTALLED_PACKAGES);
long userSerial = mUserManager.getSerialNumberForUser(user);
for (LauncherActivityInfoCompat app : mLauncherApps.getActivityList(packageName, user)) {
- addIconToDBAndMemCache(app, info, userSerial);
+ addIconToDBAndMemCache(app, info, userSerial, false /*replace existing*/);
}
} catch (NameNotFoundException e) {
Log.d(TAG, "Package not found", e);
@@ -354,29 +354,14 @@
}
}
- @Thunk void addIconToDBAndMemCache(LauncherActivityInfoCompat app, PackageInfo info,
- long userSerial) {
- // Reuse the existing entry if it already exists in the DB. This ensures that we do not
- // create bitmap if it was already created during loader.
- ContentValues values = updateCacheAndGetContentValues(app, false);
- addIconToDB(values, app.getComponentName(), info, userSerial);
- }
-
/**
- * Updates {@param values} to contain versioning information and adds it to the DB.
- * @param values {@link ContentValues} containing icon & title
+ * Adds an entry into the DB and the in-memory cache.
+ * @param replaceExisting if true, it will recreate the bitmap even if it already exists in
+ * the memory. This is useful then the previous bitmap was created using
+ * old data.
*/
- private void addIconToDB(ContentValues values, ComponentName key,
- PackageInfo info, long userSerial) {
- values.put(IconDB.COLUMN_COMPONENT, key.flattenToString());
- values.put(IconDB.COLUMN_USER, userSerial);
- values.put(IconDB.COLUMN_LAST_UPDATED, info.lastUpdateTime);
- values.put(IconDB.COLUMN_VERSION, info.versionCode);
- mIconDb.insertOrReplace(values);
- }
-
- @Thunk ContentValues updateCacheAndGetContentValues(LauncherActivityInfoCompat app,
- boolean replaceExisting) {
+ @Thunk synchronized void addIconToDBAndMemCache(LauncherActivityInfoCompat app,
+ PackageInfo info, long userSerial, boolean replaceExisting) {
final ComponentKey key = new ComponentKey(app.getComponentName(), app.getUser());
CacheEntry entry = null;
if (!replaceExisting) {
@@ -394,11 +379,25 @@
}
entry.title = app.getLabel();
entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, app.getUser());
- mCache.put(new ComponentKey(app.getComponentName(), app.getUser()), entry);
+ mCache.put(key, entry);
Bitmap lowResIcon = generateLowResIcon(entry.icon, mActivityBgColor);
- return newContentValues(entry.icon, lowResIcon, entry.title.toString(),
+ ContentValues values = newContentValues(entry.icon, lowResIcon, entry.title.toString(),
app.getApplicationInfo().packageName);
+ addIconToDB(values, app.getComponentName(), info, userSerial);
+ }
+
+ /**
+ * Updates {@param values} to contain versioning information and adds it to the DB.
+ * @param values {@link ContentValues} containing icon & title
+ */
+ private void addIconToDB(ContentValues values, ComponentName key,
+ PackageInfo info, long userSerial) {
+ values.put(IconDB.COLUMN_COMPONENT, key.flattenToString());
+ values.put(IconDB.COLUMN_USER, userSerial);
+ values.put(IconDB.COLUMN_LAST_UPDATED, info.lastUpdateTime);
+ values.put(IconDB.COLUMN_VERSION, info.versionCode);
+ mIconDb.insertOrReplace(values);
}
/**
@@ -775,13 +774,9 @@
LauncherActivityInfoCompat app = mAppsToUpdate.pop();
String pkg = app.getComponentName().getPackageName();
PackageInfo info = mPkgInfoMap.get(pkg);
- if (info != null) {
- synchronized (IconCache.this) {
- ContentValues values = updateCacheAndGetContentValues(app, true);
- addIconToDB(values, app.getComponentName(), info, mUserSerial);
- }
- mUpdatedPackages.add(pkg);
- }
+ addIconToDBAndMemCache(app, info, mUserSerial, true /*replace existing*/);
+ mUpdatedPackages.add(pkg);
+
if (mAppsToUpdate.isEmpty() && !mUpdatedPackages.isEmpty()) {
// No more app to update. Notify model.
LauncherAppState.getInstance().getModel().onPackageIconsUpdated(
@@ -793,10 +788,10 @@
} else if (!mAppsToAdd.isEmpty()) {
LauncherActivityInfoCompat app = mAppsToAdd.pop();
PackageInfo info = mPkgInfoMap.get(app.getComponentName().getPackageName());
+ // We do not check the mPkgInfoMap when generating the mAppsToAdd. Although every
+ // app should have package info, this is not guaranteed by the api
if (info != null) {
- synchronized (IconCache.this) {
- addIconToDBAndMemCache(app, info, mUserSerial);
- }
+ addIconToDBAndMemCache(app, info, mUserSerial, false /*replace existing*/);
}
if (!mAppsToAdd.isEmpty()) {
diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index d8e58d8..bd20e32 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -226,7 +226,8 @@
String packageName = pendingInfo.getTargetPackage();
if (!TextUtils.isEmpty(packageName)) {
UserHandleCompat myUserHandle = UserHandleCompat.myUserHandle();
- if (!LauncherModel.isValidPackage(context, packageName, myUserHandle)) {
+ if (!LauncherAppsCompat.getInstance(context)
+ .isPackageEnabledForProfile(packageName, myUserHandle)) {
if (DBG) Log.d(TAG, "Ignoring shortcut for absent package: "
+ pendingInfo.launchIntent);
continue;
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index b1700cc..43a250b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -18,9 +18,7 @@
import android.Manifest;
import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
@@ -47,8 +45,6 @@
import android.content.res.Configuration;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
@@ -79,10 +75,8 @@
import android.view.ViewTreeObserver;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityNodeInfo;
import android.view.animation.OvershootInterpolator;
import android.view.inputmethod.InputMethodManager;
-import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -295,13 +289,6 @@
// it from the context.
private SharedPreferences mSharedPrefs;
- // Holds the page that we need to animate to, and the icon views that we need to animate up
- // when we scroll to that page on resume.
- @Thunk ImageView mFolderIconImageView;
- private Bitmap mFolderIconBitmap;
- private Canvas mFolderIconCanvas;
- private Rect mRectForFolderAnimation = new Rect();
-
private DeviceProfile mDeviceProfile;
private boolean mMoveToDefaultScreenFromNewIntent;
@@ -1231,11 +1218,8 @@
if (keyCode == KeyEvent.KEYCODE_MENU) {
// Ignore the menu key if we are currently dragging or are on the custom content screen
if (!isOnCustomContent() && !mDragController.isDragging()) {
- // Close any open folders
- closeFolder();
-
- // Close any shortcuts containers
- closeShortcutsContainer();
+ // Close any open floating view
+ AbstractFloatingView.closeAllOpenViews(this);
// Stop resizing any widgets
mWorkspace.exitWidgetResizeMode();
@@ -1705,7 +1689,7 @@
// Check this condition before handling isActionMain, as this will get reset.
boolean shouldMoveToDefaultScreen = alreadyOnHome &&
- mState == State.WORKSPACE && getTopFloatingView() == null;
+ mState == State.WORKSPACE && AbstractFloatingView.getTopOpenView(this) == null;
boolean isActionMain = Intent.ACTION_MAIN.equals(intent.getAction());
if (isActionMain) {
@@ -1719,8 +1703,7 @@
// In all these cases, only animate if we're already on home
mWorkspace.exitWidgetResizeMode();
- closeFolder(alreadyOnHome);
- closeShortcutsContainer(alreadyOnHome);
+ AbstractFloatingView.closeAllOpenViews(this, alreadyOnHome);
exitSpringLoadedDragMode();
// If we are already on home, then just animate back to the workspace,
@@ -1803,11 +1786,9 @@
super.onSaveInstanceState(outState);
outState.putInt(RUNTIME_STATE, mState.ordinal());
- // We close any open folder since it will not be re-opened, and we need to make sure
- // this state is reflected.
- // TODO: Move folderInfo.isOpened out of the model and make it a UI state.
- closeFolder(false);
- closeShortcutsContainer(false);
+ // We close any open folders and shortcut containers since they will not be re-opened,
+ // and we need to make sure this state is reflected.
+ AbstractFloatingView.closeAllOpenViews(this, false);
if (mPendingRequestArgs != null) {
outState.putParcelable(RUNTIME_STATE_PENDING_REQUEST_ARGS, mPendingRequestArgs);
@@ -2036,7 +2017,7 @@
protected void moveToCustomContentScreen(boolean animate) {
// Close any folders that may be open.
- closeFolder();
+ AbstractFloatingView.closeAllOpenViews(this, animate);
mWorkspace.moveToCustomContentScreen(animate);
}
@@ -2227,21 +2208,19 @@
return;
}
- if (getOpenShortcutsContainer() != null) {
- closeShortcutsContainer();
+ AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(this);
+ if (topView != null) {
+ if (topView.getActiveTextView() != null) {
+ topView.getActiveTextView().dispatchBackKey();
+ } else {
+ topView.close(true);
+ }
} else if (isAppsViewVisible()) {
showWorkspace(true);
} else if (isWidgetsViewVisible()) {
showOverviewMode(true);
} else if (mWorkspace.isInOverviewMode()) {
showWorkspace(true);
- } else if (mWorkspace.getOpenFolder() != null) {
- Folder openFolder = mWorkspace.getOpenFolder();
- if (openFolder.isEditingName()) {
- openFolder.dismissEditingName();
- } else {
- closeFolder();
- }
} else {
mWorkspace.exitWidgetResizeMode();
@@ -2491,10 +2470,10 @@
throw new IllegalArgumentException("Input must be a FolderIcon");
}
- FolderIcon folderIcon = (FolderIcon) v;
- if (!folderIcon.getFolderInfo().opened && !folderIcon.getFolder().isDestroyed()) {
+ Folder folder = ((FolderIcon) v).getFolder();
+ if (!folder.isOpen() && !folder.isDestroyed()) {
// Open the requested folder
- openFolder(folderIcon);
+ folder.animateOpen();
}
}
@@ -2735,233 +2714,6 @@
return false;
}
- /**
- * This method draws the FolderIcon to an ImageView and then adds and positions that ImageView
- * in the DragLayer in the exact absolute location of the original FolderIcon.
- */
- private void copyFolderIconToImage(FolderIcon fi) {
- final int width = fi.getMeasuredWidth();
- final int height = fi.getMeasuredHeight();
-
- // Lazy load ImageView, Bitmap and Canvas
- if (mFolderIconImageView == null) {
- mFolderIconImageView = new ImageView(this);
- }
- if (mFolderIconBitmap == null || mFolderIconBitmap.getWidth() != width ||
- mFolderIconBitmap.getHeight() != height) {
- mFolderIconBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- mFolderIconCanvas = new Canvas(mFolderIconBitmap);
- }
-
- DragLayer.LayoutParams lp;
- if (mFolderIconImageView.getLayoutParams() instanceof DragLayer.LayoutParams) {
- lp = (DragLayer.LayoutParams) mFolderIconImageView.getLayoutParams();
- } else {
- lp = new DragLayer.LayoutParams(width, height);
- }
-
- // The layout from which the folder is being opened may be scaled, adjust the starting
- // view size by this scale factor.
- float scale = mDragLayer.getDescendantRectRelativeToSelf(fi, mRectForFolderAnimation);
- lp.customPosition = true;
- lp.x = mRectForFolderAnimation.left;
- lp.y = mRectForFolderAnimation.top;
- lp.width = (int) (scale * width);
- lp.height = (int) (scale * height);
-
- mFolderIconCanvas.drawColor(0, PorterDuff.Mode.CLEAR);
- fi.draw(mFolderIconCanvas);
- mFolderIconImageView.setImageBitmap(mFolderIconBitmap);
- if (fi.getFolder() != null) {
- mFolderIconImageView.setPivotX(fi.getFolder().getPivotXForIconAnimation());
- mFolderIconImageView.setPivotY(fi.getFolder().getPivotYForIconAnimation());
- }
- // Just in case this image view is still in the drag layer from a previous animation,
- // we remove it and re-add it.
- if (mDragLayer.indexOfChild(mFolderIconImageView) != -1) {
- mDragLayer.removeView(mFolderIconImageView);
- }
- mDragLayer.addView(mFolderIconImageView, lp);
- if (fi.getFolder() != null) {
- fi.getFolder().bringToFront();
- }
- }
-
- private void growAndFadeOutFolderIcon(FolderIcon fi) {
- if (fi == null) return;
- FolderInfo info = (FolderInfo) fi.getTag();
- if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
- CellLayout cl = (CellLayout) fi.getParent().getParent();
- CellLayout.LayoutParams lp = (CellLayout.LayoutParams) fi.getLayoutParams();
- cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
- }
-
- // Push an ImageView copy of the FolderIcon into the DragLayer and hide the original
- copyFolderIconToImage(fi);
- fi.setVisibility(View.INVISIBLE);
-
- ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(
- mFolderIconImageView, 0, 1.5f, 1.5f);
- if (Utilities.ATLEAST_LOLLIPOP) {
- oa.setInterpolator(new LogDecelerateInterpolator(100, 0));
- }
- oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
- oa.start();
- }
-
- private void shrinkAndFadeInFolderIcon(final FolderIcon fi, boolean animate) {
- if (fi == null) return;
- final CellLayout cl = (CellLayout) fi.getParent().getParent();
-
- // We remove and re-draw the FolderIcon in-case it has changed
- mDragLayer.removeView(mFolderIconImageView);
- copyFolderIconToImage(fi);
-
- if (cl != null) {
- cl.clearFolderLeaveBehind();
- }
-
- ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(mFolderIconImageView, 1, 1, 1);
- oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
- oa.addListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- if (cl != null) {
- // Remove the ImageView copy of the FolderIcon and make the original visible.
- mDragLayer.removeView(mFolderIconImageView);
- fi.setVisibility(View.VISIBLE);
- }
- }
- });
- oa.start();
- if (!animate) {
- oa.end();
- }
- }
-
- /**
- * Opens the user folder described by the specified tag. The opening of the folder
- * is animated relative to the specified View. If the View is null, no animation
- * is played.
- *
- * @param folderIcon The FolderIcon describing the folder to open.
- */
- public void openFolder(FolderIcon folderIcon) {
-
- Folder folder = folderIcon.getFolder();
- Folder openFolder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
- if (openFolder != null && openFolder != folder) {
- // Close any open folder before opening a folder.
- closeFolder();
- }
-
- FolderInfo info = folder.mInfo;
-
- info.opened = true;
-
- // While the folder is open, the position of the icon cannot change.
- ((CellLayout.LayoutParams) folderIcon.getLayoutParams()).canReorder = false;
-
- // Just verify that the folder hasn't already been added to the DragLayer.
- // There was a one-off crash where the folder had a parent already.
- if (folder.getParent() == null) {
- mDragLayer.addView(folder);
- mDragController.addDropTarget(folder);
- } else {
- Log.w(TAG, "Opening folder (" + folder + ") which already has a parent (" +
- folder.getParent() + ").");
- }
- folder.animateOpen();
-
- growAndFadeOutFolderIcon(folderIcon);
-
- // Notify the accessibility manager that this folder "window" has appeared and occluded
- // the workspace items
- folder.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
- getDragLayer().sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
-
- getUserEventDispatcher().resetElapsedContainerMillis();
- }
-
- public void closeFolder() {
- closeFolder(true);
- }
-
- public void closeFolder(boolean animate) {
- Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
- if (folder != null) {
- if (folder.isEditingName()) {
- folder.dismissEditingName();
- }
- closeFolder(folder, animate);
- }
- }
-
- public void closeFolder(Folder folder, boolean animate) {
- animate &= !Utilities.isPowerSaverOn(this);
-
- folder.getInfo().opened = false;
-
- ViewGroup parent = (ViewGroup) folder.getParent().getParent();
- if (parent != null) {
- FolderIcon fi = (FolderIcon) mWorkspace.getViewForTag(folder.mInfo);
- shrinkAndFadeInFolderIcon(fi, animate);
- if (fi != null) {
- ((CellLayout.LayoutParams) fi.getLayoutParams()).canReorder = true;
- }
- }
- if (animate) {
- folder.animateClosed();
- } else {
- folder.close(false);
- }
-
- // Notify the accessibility manager that this folder "window" has disappeared and no
- // longer occludes the workspace items
- getDragLayer().sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
-
- getUserEventDispatcher().resetElapsedContainerMillis();
- }
-
- public void closeShortcutsContainer() {
- closeShortcutsContainer(true);
- }
-
- public void closeShortcutsContainer(boolean animate) {
- DeepShortcutsContainer deepShortcutsContainer = getOpenShortcutsContainer();
- if (deepShortcutsContainer != null) {
- if (animate) {
- deepShortcutsContainer.animateClose();
- } else {
- deepShortcutsContainer.close();
- }
- }
- }
-
- public View getTopFloatingView() {
- View topView = getOpenShortcutsContainer();
- if (topView == null) {
- topView = getWorkspace().getOpenFolder();
- }
- return topView;
- }
-
- /**
- * @return The open shortcuts container, or null if there is none
- */
- public DeepShortcutsContainer getOpenShortcutsContainer() {
- // Iterate in reverse order. Shortcuts container is added later to the dragLayer,
- // and will be one of the last views.
- for (int i = mDragLayer.getChildCount() - 1; i >= 0; i--) {
- View child = mDragLayer.getChildAt(i);
- if (child instanceof DeepShortcutsContainer
- && ((DeepShortcutsContainer) child).isOpen()) {
- return (DeepShortcutsContainer) child;
- }
- }
- return null;
- }
-
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
mLastDispatchTouchEventX = ev.getX();
@@ -3220,9 +2972,7 @@
// Change the state *after* we've called all the transition code
mState = toState;
-
- closeFolder();
- closeShortcutsContainer();
+ AbstractFloatingView.closeAllOpenViews(this);
// Send an accessibility event to announce the context change
getWindow().getDecorView()
@@ -4379,7 +4129,7 @@
&& mAccessibilityDelegate.performAction(focusedView,
(ItemInfo) focusedView.getTag(),
LauncherAccessibilityDelegate.DEEP_SHORTCUTS)) {
- getOpenShortcutsContainer().requestFocus();
+ DeepShortcutsContainer.getOpen(this).requestFocus();
return true;
}
break;
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4afff18..3f9c2a3 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -93,7 +93,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -145,9 +144,6 @@
// Entire list of widgets.
private final WidgetsModel mBgWidgetsModel;
- // Maps all launcher activities to the id's of their shortcuts (if they have any).
- private final MultiHashMap<ComponentKey, String> mBgDeepShortcutMap = new MultiHashMap<>();
-
private boolean mHasShortcutHostPermission;
// Runnable to check if the shortcuts permission has changed.
private final Runnable mShortcutPermissionCheckRunnable = new Runnable() {
@@ -316,15 +312,7 @@
ComponentName cn = si.getTargetComponent();
if (si.isPromise() && (cn != null)
&& packageName.equals(cn.getPackageName())) {
- if (si.hasStatusFlag(ShortcutInfo.FLAG_AUTOINTALL_ICON)) {
- // For auto install apps update the icon as well as label.
- mIconCache.getTitleAndIcon(si,
- si.promisedIntent, user,
- si.shouldUseLowResIcon());
- } else {
- // Only update the icon for restored apps.
- si.updateIcon(mIconCache);
- }
+ si.updateIcon(mIconCache);
updates.add(si);
}
}
@@ -2647,14 +2635,14 @@
Log.d(TAG, "loadAndBindDeepShortcuts mDeepShortcutsLoaded=" + mDeepShortcutsLoaded);
}
if (!mDeepShortcutsLoaded) {
- mBgDeepShortcutMap.clear();
+ sBgDataModel.deepShortcutMap.clear();
mHasShortcutHostPermission = mDeepShortcutManager.hasHostPermission();
if (mHasShortcutHostPermission) {
for (UserHandleCompat user : mUserManager.getUserProfiles()) {
if (mUserManager.isUserUnlocked(user)) {
List<ShortcutInfoCompat> shortcuts = mDeepShortcutManager
.queryForAllShortcuts(user);
- updateDeepShortcutMap(null, user, shortcuts);
+ sBgDataModel.updateDeepShortcutMap(null, user, shortcuts);
}
}
}
@@ -2678,36 +2666,9 @@
}
}
- /**
- * Clear all the shortcuts for the given package, and re-add the new shortcuts.
- */
- private void updateDeepShortcutMap(
- String packageName, UserHandleCompat user, List<ShortcutInfoCompat> shortcuts) {
- if (packageName != null) {
- Iterator<ComponentKey> keysIter = mBgDeepShortcutMap.keySet().iterator();
- while (keysIter.hasNext()) {
- ComponentKey next = keysIter.next();
- if (next.componentName.getPackageName().equals(packageName)
- && next.user.equals(user)) {
- keysIter.remove();
- }
- }
- }
-
- // Now add the new shortcuts to the map.
- for (ShortcutInfoCompat shortcut : shortcuts) {
- boolean shouldShowInContainer = shortcut.isEnabled()
- && (shortcut.isDeclaredInManifest() || shortcut.isDynamic());
- if (shouldShowInContainer) {
- ComponentKey targetComponent
- = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle());
- mBgDeepShortcutMap.addToList(targetComponent, shortcut.getId());
- }
- }
- }
-
public void bindDeepShortcuts() {
- final MultiHashMap<ComponentKey, String> shortcutMapCopy = mBgDeepShortcutMap.clone();
+ final MultiHashMap<ComponentKey, String> shortcutMapCopy =
+ sBgDataModel.deepShortcutMap.clone();
Runnable r = new Runnable() {
@Override
public void run() {
@@ -2989,11 +2950,6 @@
}
}
- // Restore the shortcut.
- if (appInfo != null) {
- si.flags = appInfo.flags;
- }
-
si.intent = si.promisedIntent;
si.promisedIntent = null;
si.status = ShortcutInfo.DEFAULT;
@@ -3221,7 +3177,7 @@
if (mUpdateIdMap) {
// Update the deep shortcut map if the list of ids has changed for an activity.
- updateDeepShortcutMap(mPackageName, mUser, mShortcuts);
+ sBgDataModel.updateDeepShortcutMap(mPackageName, mUser, mShortcuts);
bindDeepShortcuts();
}
}
@@ -3289,7 +3245,7 @@
}
// Remove shortcut id map for that user
- Iterator<ComponentKey> keysIter = mBgDeepShortcutMap.keySet().iterator();
+ Iterator<ComponentKey> keysIter = sBgDataModel.deepShortcutMap.keySet().iterator();
while (keysIter.hasNext()) {
if (keysIter.next().user.equals(mUser)) {
keysIter.remove();
@@ -3297,7 +3253,8 @@
}
if (isUserUnlocked) {
- updateDeepShortcutMap(null, mUser, mDeepShortcutManager.queryForAllShortcuts(mUser));
+ sBgDataModel.updateDeepShortcutMap(
+ null, mUser, mDeepShortcutManager.queryForAllShortcuts(mUser));
}
bindDeepShortcuts();
}
@@ -3338,15 +3295,6 @@
return !launcherApps.isPackageEnabledForProfile(packageName, user);
}
- public static boolean isValidPackage(Context context, String packageName,
- UserHandleCompat user) {
- if (packageName == null) {
- return false;
- }
- final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
- return launcherApps.isPackageEnabledForProfile(packageName, user);
- }
-
/**
* Make an ShortcutInfo object for a restored application or shortcut item that points
* to a package that is not yet installed on the system.
@@ -3454,9 +3402,6 @@
info.itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
info.user = user;
info.contentDescription = mUserManager.getBadgedLabelForUser(info.title, info.user);
- if (lai != null) {
- info.flags = AppInfo.initFlags(lai);
- }
return info;
}
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index e1ff6db..229dd9c 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1014,7 +1014,7 @@
public void checkId(String table, ContentValues values) {
long id = values.getAsLong(LauncherSettings.BaseLauncherColumns._ID);
- if (table == WorkspaceScreens.TABLE_NAME) {
+ if (WorkspaceScreens.TABLE_NAME.equals(table)) {
mMaxScreenId = Math.max(id, mMaxScreenId);
} else {
mMaxItemId = Math.max(id, mMaxItemId);
diff --git a/src/com/android/launcher3/PinchAnimationManager.java b/src/com/android/launcher3/PinchAnimationManager.java
index baeb77c..84ef12e 100644
--- a/src/com/android/launcher3/PinchAnimationManager.java
+++ b/src/com/android/launcher3/PinchAnimationManager.java
@@ -24,6 +24,8 @@
import android.view.View;
import android.view.animation.LinearInterpolator;
+import com.android.launcher3.userevent.nano.LauncherLogProto;
+
import static com.android.launcher3.Workspace.State.NORMAL;
import static com.android.launcher3.Workspace.State.OVERVIEW;
@@ -162,9 +164,15 @@
} else if (threshold == PinchThresholdManager.THRESHOLD_THREE) {
// Passing threshold 3 ends the pinch and snaps to the new state.
if (startState == OVERVIEW && goingTowards == NORMAL) {
+ mLauncher.getUserEventDispatcher().logActionOnContainer(
+ LauncherLogProto.Action.PINCH, LauncherLogProto.Action.NONE,
+ LauncherLogProto.OVERVIEW, mWorkspace.getCurrentPage());
mLauncher.showWorkspace(true);
mWorkspace.snapToPage(mWorkspace.getCurrentPage());
} else if (startState == NORMAL && goingTowards == OVERVIEW) {
+ mLauncher.getUserEventDispatcher().logActionOnContainer(
+ LauncherLogProto.Action.PINCH, LauncherLogProto.Action.NONE,
+ LauncherLogProto.WORKSPACE, mWorkspace.getCurrentPage());
mLauncher.showOverviewMode(true);
}
} else {
diff --git a/src/com/android/launcher3/PinchToOverviewListener.java b/src/com/android/launcher3/PinchToOverviewListener.java
index bc5ac24..66209bf 100644
--- a/src/com/android/launcher3/PinchToOverviewListener.java
+++ b/src/com/android/launcher3/PinchToOverviewListener.java
@@ -102,7 +102,7 @@
// once the state switching animation is complete.
return false;
}
- if (mLauncher.getTopFloatingView() != null) {
+ if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
// Don't listen for the pinch gesture if a floating view is open.
return false;
}
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
index ce06291..9a92872 100644
--- a/src/com/android/launcher3/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -148,11 +148,6 @@
private int mInstallProgress;
/**
- * TODO move this to {@link #status}
- */
- int flags = 0;
-
- /**
* If this shortcut is a placeholder, then intent will be a market intent for the package, and
* this will hold the original intent from the database. Otherwise, null.
* Refer {@link #FLAG_RESTORED_ICON}, {@link #FLAG_AUTOINTALL_ICON}
@@ -189,7 +184,6 @@
intent = new Intent(info.intent);
iconResource = info.iconResource;
mIcon = info.mIcon; // TODO: should make a copy here. maybe we don't need this ctor at all
- flags = info.flags;
status = info.status;
mInstallProgress = info.mInstallProgress;
isDisabled = info.isDisabled;
@@ -201,7 +195,6 @@
super(info);
title = Utilities.trim(info.title);
intent = new Intent(info.intent);
- flags = info.flags;
isDisabled = info.isDisabled;
}
@@ -212,7 +205,6 @@
.getBadgedLabelForUser(info.getLabel(), info.getUser());
intent = AppInfo.makeLaunchIntent(context, info, info.getUser());
itemType = LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
- flags = AppInfo.initFlags(info);
}
/**
@@ -222,7 +214,6 @@
public ShortcutInfo(ShortcutInfoCompat shortcutInfo, Context context) {
user = shortcutInfo.getUserHandle();
itemType = LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;
- flags = 0;
updateFromDeepShortcutInfo(shortcutInfo, context);
}
diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java
index 9153943..7ea9aca 100644
--- a/src/com/android/launcher3/UninstallDropTarget.java
+++ b/src/com/android/launcher3/UninstallDropTarget.java
@@ -4,6 +4,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -12,6 +13,8 @@
import android.util.Pair;
import android.widget.Toast;
+import com.android.launcher3.compat.LauncherActivityInfoCompat;
+import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat;
public class UninstallDropTarget extends ButtonDropTarget {
@@ -49,23 +52,34 @@
}
}
- Pair<ComponentName, Integer> componentInfo = getAppInfoFlags(info);
- return componentInfo != null && (componentInfo.second & AppInfo.DOWNLOADED_FLAG) != 0;
+ return getUninstallTarget(context, info) != null;
}
/**
- * @return the component name and flags if {@param info} is an AppInfo or an app shortcut.
+ * @return the component name that should be uninstalled or null.
*/
- private static Pair<ComponentName, Integer> getAppInfoFlags(Object item) {
+ private static ComponentName getUninstallTarget(Context context, Object item) {
+ Intent intent = null;
+ UserHandleCompat user = null;
if (item instanceof AppInfo) {
AppInfo info = (AppInfo) item;
- return Pair.create(info.componentName, info.flags);
+ intent = info.intent;
+ user = info.user;
} else if (item instanceof ShortcutInfo) {
ShortcutInfo info = (ShortcutInfo) item;
- ComponentName component = info.getTargetComponent();
- if (info.itemType == LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION
- && component != null) {
- return Pair.create(component, info.flags);
+ if (info.itemType == LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION) {
+ // Do not use restore/target intent here as we cannot uninstall an app which is
+ // being installed/restored.
+ intent = info.intent;
+ user = info.user;
+ }
+ }
+ if (intent != null) {
+ LauncherActivityInfoCompat info = LauncherAppsCompat.getInstance(context)
+ .resolveActivity(intent, user);
+ if (info != null
+ && (info.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+ return info.getComponentName();
}
}
return null;
@@ -93,11 +107,10 @@
public static boolean startUninstallActivity(
final Launcher launcher, ItemInfo info, DropTargetResultCallback callback) {
- Pair<ComponentName, Integer> componentInfo = getAppInfoFlags(info);
- ComponentName cn = componentInfo.first;
+ final ComponentName cn = getUninstallTarget(launcher, info);
final boolean isUninstallable;
- if ((componentInfo.second & AppInfo.DOWNLOADED_FLAG) == 0) {
+ if (cn == null) {
// System applications cannot be installed. For now, show a toast explaining that.
// We may give them the option of disabling apps this way.
Toast.makeText(launcher, R.string.uninstall_system_app_text, Toast.LENGTH_SHORT).show();
@@ -112,8 +125,7 @@
isUninstallable = true;
}
if (callback != null) {
- sendUninstallResult(
- launcher, isUninstallable, componentInfo.first, info.user, callback);
+ sendUninstallResult(launcher, isUninstallable, cn, info.user, callback);
}
return isUninstallable;
}
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index d252460..f529735 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -553,24 +553,6 @@
cl.getBackgroundAlpha() > 0);
}
- /**
- * @return The open folder on the current screen, or null if there is none
- */
- public Folder getOpenFolder() {
- DragLayer dragLayer = mLauncher.getDragLayer();
- // Iterate in reverse order. Folder is added later to the dragLayer,
- // and will be one of the last views.
- for (int i = dragLayer.getChildCount() - 1; i >= 0; i--) {
- View child = dragLayer.getChildAt(i);
- if (child instanceof Folder) {
- Folder folder = (Folder) child;
- if (folder.getInfo().opened)
- return folder;
- }
- }
- return null;
- }
-
boolean isTouchActive() {
return mTouchState != TOUCH_STATE_REST;
}
@@ -3811,7 +3793,7 @@
if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollLeft();
}
- Folder openFolder = getOpenFolder();
+ Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) {
openFolder.completeDragExit();
}
@@ -3822,7 +3804,7 @@
if (!workspaceInModalState() && !mIsSwitchingState) {
super.scrollRight();
}
- Folder openFolder = getOpenFolder();
+ Folder openFolder = Folder.getOpen(mLauncher);
if (openFolder != null) {
openFolder.completeDragExit();
}
@@ -3841,7 +3823,7 @@
}
boolean result = false;
- if (!workspaceInModalState() && !mIsSwitchingState && getOpenFolder() == null) {
+ if (!workspaceInModalState() && !mIsSwitchingState && Folder.getOpen(mLauncher) == null) {
mInScrollArea = true;
final int page = getNextPage() +
@@ -4256,7 +4238,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
target.gridX = info.cellX;
target.gridY = info.cellY;
target.pageIndex = getCurrentPage();
diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
index 439e314..83391f3 100644
--- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java
@@ -192,8 +192,8 @@
});
return true;
} else if (action == MOVE_TO_WORKSPACE) {
- Folder folder = mLauncher.getWorkspace().getOpenFolder();
- mLauncher.closeFolder(folder, true);
+ Folder folder = Folder.getOpen(mLauncher);
+ folder.close(true);
ShortcutInfo info = (ShortcutInfo) item;
folder.getInfo().remove(info, false);
@@ -373,12 +373,10 @@
mLauncher.getDragLayer().getDescendantRectRelativeToSelf(item, pos);
mLauncher.getDragController().prepareAccessibleDrag(pos.centerX(), pos.centerY());
- Workspace workspace = mLauncher.getWorkspace();
-
- Folder folder = workspace.getOpenFolder();
+ Folder folder = Folder.getOpen(mLauncher);
if (folder != null) {
if (!folder.getItemsInReadingOrder().contains(item)) {
- mLauncher.closeFolder();
+ folder.close(true);
folder = null;
}
}
@@ -390,7 +388,7 @@
if (folder != null) {
folder.startDrag(cellInfo.cell, options);
} else {
- workspace.startDrag(cellInfo, options);
+ mLauncher.getWorkspace().startDrag(cellInfo, options);
}
}
diff --git a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
index 5baa7b5..f7ca703 100644
--- a/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
+++ b/src/com/android/launcher3/accessibility/ShortcutMenuAccessibilityDelegate.java
@@ -19,6 +19,7 @@
import android.view.View;
import android.view.accessibility.AccessibilityNodeInfo;
+import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherModel;
@@ -64,7 +65,7 @@
ArrayList<ItemInfo> itemList = new ArrayList<>();
itemList.add(info);
mLauncher.bindItems(itemList, 0, itemList.size(), true);
- mLauncher.closeShortcutsContainer();
+ AbstractFloatingView.closeAllOpenViews(mLauncher);
announceConfirmation(R.string.item_added_to_workspace);
}
};
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 77e8ad1..689ee38 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -52,6 +52,7 @@
import com.android.launcher3.folder.Folder;
import com.android.launcher3.graphics.TintedDrawableSpan;
import com.android.launcher3.keyboard.FocusedItemDecorator;
+import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import com.android.launcher3.userevent.nano.LauncherLogProto.Target;
import com.android.launcher3.util.ComponentKey;
@@ -265,7 +266,7 @@
}
// IF a shortcuts container is open, container should not be pulled down.
- if (mLauncher.getOpenShortcutsContainer() != null) {
+ if (DeepShortcutsContainer.getOpen(mLauncher) != null) {
return false;
}
@@ -586,7 +587,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
targetParent.containerType = mAppsRecyclerView.getContainerType(v);
}
diff --git a/src/com/android/launcher3/dragndrop/AnotherWindowDragSource.java b/src/com/android/launcher3/dragndrop/AnotherWindowDragSource.java
index 156941a..e968f36 100644
--- a/src/com/android/launcher3/dragndrop/AnotherWindowDragSource.java
+++ b/src/com/android/launcher3/dragndrop/AnotherWindowDragSource.java
@@ -70,7 +70,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
// TODO: Probably log something
}
}
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java
index ef9c965..019a174 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -38,6 +38,7 @@
import android.util.AttributeSet;
import android.view.DragEvent;
import android.view.KeyEvent;
+import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
@@ -48,9 +49,11 @@
import android.widget.FrameLayout;
import android.widget.TextView;
+import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.AppWidgetResizeFrame;
import com.android.launcher3.CellLayout;
import com.android.launcher3.DropTargetBar;
+import com.android.launcher3.ExtendedEditText;
import com.android.launcher3.InsettableFrameLayout;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAppWidgetHostView;
@@ -65,7 +68,6 @@
import com.android.launcher3.folder.Folder;
import com.android.launcher3.folder.FolderIcon;
import com.android.launcher3.keyboard.ViewGroupFocusHelper;
-import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.util.TouchController;
@@ -177,18 +179,13 @@
}
public boolean isEventOverPageIndicator(MotionEvent ev) {
- getDescendantRectRelativeToSelf(mLauncher.getWorkspace().getPageIndicator(), mHitRect);
- return mHitRect.contains((int) ev.getX(), (int) ev.getY());
+ return isEventOverView(mLauncher.getWorkspace().getPageIndicator(), ev);
}
public boolean isEventOverHotseat(MotionEvent ev) {
return isEventOverView(mLauncher.getHotseat(), ev);
}
- private boolean isEventOverFolderTextRegion(Folder folder, MotionEvent ev) {
- return isEventOverView(folder.getEditTextRegion(), ev);
- }
-
private boolean isEventOverFolder(Folder folder, MotionEvent ev) {
return isEventOverView(folder, ev);
}
@@ -203,45 +200,27 @@
}
private boolean handleTouchDown(MotionEvent ev, boolean intercept) {
- // Remove the shortcuts container when touching outside of it.
- DeepShortcutsContainer deepShortcutsContainer = mLauncher.getOpenShortcutsContainer();
- if (deepShortcutsContainer != null) {
- if (isEventOverView(deepShortcutsContainer, ev)) {
- // Let the container handle the event.
- return false;
- } else {
+ AbstractFloatingView topView = AbstractFloatingView.getTopOpenView(mLauncher);
+ if (topView != null && intercept) {
+ ExtendedEditText textView = topView.getActiveTextView();
+ if (textView != null) {
+ if (!isEventOverView(textView, ev)) {
+ textView.dispatchBackKey();
+ return true;
+ }
+ } else if (!isEventOverView(topView, ev)) {
if (isInAccessibleDrag()) {
// Do not close the container if in drag and drop.
if (!isEventOverDropTargetBar(ev)) {
return true;
}
} else {
- mLauncher.closeShortcutsContainer();
+ topView.close(true);
+
// We let touches on the original icon go through so that users can launch
// the app with one tap if they don't find a shortcut they want.
- return !isEventOverView(deepShortcutsContainer.getOriginalIcon(), ev);
- }
- }
- }
-
- Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
- if (currentFolder != null && intercept) {
- if (currentFolder.isEditingName()) {
- if (!isEventOverFolderTextRegion(currentFolder, ev)) {
- currentFolder.dismissEditingName();
- return true;
- }
- }
-
- if (!isEventOverFolder(currentFolder, ev)) {
- if (isInAccessibleDrag()) {
- // Do not close the folder if in drag and drop.
- if (!isEventOverDropTargetBar(ev)) {
- return true;
- }
- } else {
- mLauncher.closeFolder();
- return true;
+ View extendedTouch = topView.getExtendedTouchView();
+ return extendedTouch == null || !isEventOverView(extendedTouch, ev);
}
}
}
@@ -299,7 +278,7 @@
if (mLauncher == null || mLauncher.getWorkspace() == null) {
return false;
}
- Folder currentFolder = mLauncher.getWorkspace().getOpenFolder();
+ Folder currentFolder = Folder.getOpen(mLauncher);
if (currentFolder == null) {
return false;
} else {
@@ -349,7 +328,7 @@
@Override
public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
// Shortcuts can appear above folder
- View topView = mLauncher.getTopFloatingView();
+ View topView = AbstractFloatingView.getTopOpenView(mLauncher);
if (topView != null) {
if (child == topView) {
return super.onRequestSendAccessibilityEvent(child, event);
@@ -366,7 +345,7 @@
@Override
public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {
- View topView = mLauncher.getTopFloatingView();
+ View topView = AbstractFloatingView.getTopOpenView(mLauncher);
if (topView != null) {
// Only add the top view as a child for accessibility when it is open
childrenForAccessibility.add(topView);
@@ -521,7 +500,7 @@
@Override
public boolean dispatchUnhandledMove(View focused, int direction) {
// Consume the unhandled move if a container is open, to avoid switching pages underneath.
- boolean isContainerOpen = mLauncher.getTopFloatingView() != null;
+ boolean isContainerOpen = AbstractFloatingView.getTopOpenView(mLauncher) != null;
return isContainerOpen || mDragController.dispatchUnhandledMove(focused, direction);
}
@@ -621,12 +600,12 @@
public void addResizeFrame(LauncherAppWidgetHostView widget, CellLayout cellLayout) {
clearResizeFrame();
- mCurrentResizeFrame = new AppWidgetResizeFrame(getContext(), widget, cellLayout, this);
+ mCurrentResizeFrame = (AppWidgetResizeFrame) LayoutInflater.from(mLauncher)
+ .inflate(R.layout.app_widget_resize_frame, this, false);
+ mCurrentResizeFrame.setupForWidget(widget, cellLayout, this);
+ ((LayoutParams) mCurrentResizeFrame.getLayoutParams()).customPosition = true;
- LayoutParams lp = new LayoutParams(-1, -1);
- lp.customPosition = true;
-
- addView(mCurrentResizeFrame, lp);
+ addView(mCurrentResizeFrame);
mCurrentResizeFrame.snapToWidget(false);
}
@@ -1030,7 +1009,7 @@
@Override
protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) {
- View topView = mLauncher.getTopFloatingView();
+ View topView = AbstractFloatingView.getTopOpenView(mLauncher);
if (topView != null) {
return topView.requestFocus(direction, previouslyFocusedRect);
} else {
@@ -1040,7 +1019,7 @@
@Override
public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
- View topView = mLauncher.getTopFloatingView();
+ View topView = AbstractFloatingView.getTopOpenView(mLauncher);
if (topView != null) {
topView.addFocusables(views, direction);
} else {
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index b85d973..0685ddb 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -46,9 +46,9 @@
import android.view.animation.AnimationUtils;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
-import android.widget.LinearLayout;
import android.widget.TextView;
+import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.Alarm;
import com.android.launcher3.AppInfo;
import com.android.launcher3.BubbleTextView;
@@ -73,6 +73,7 @@
import com.android.launcher3.Workspace.ItemOperator;
import com.android.launcher3.accessibility.AccessibleDragListenerAdapter;
import com.android.launcher3.config.FeatureFlags;
+import com.android.launcher3.config.ProviderConfig;
import com.android.launcher3.dragndrop.DragController;
import com.android.launcher3.dragndrop.DragController.DragListener;
import com.android.launcher3.dragndrop.DragLayer;
@@ -91,9 +92,10 @@
/**
* Represents a set of icons chosen by the user or generated by the system.
*/
-public class Folder extends LinearLayout implements DragSource, View.OnClickListener,
+public class Folder extends AbstractFloatingView implements DragSource, View.OnClickListener,
View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener,
- View.OnFocusChangeListener, DragListener, DropTargetSource {
+ View.OnFocusChangeListener, DragListener, DropTargetSource,
+ ExtendedEditText.OnBackKeyListener {
private static final String TAG = "Launcher.Folder";
/**
@@ -227,14 +229,7 @@
mPageIndicator = (PageIndicatorDots) findViewById(R.id.folder_page_indicator);
mFolderName = (ExtendedEditText) findViewById(R.id.folder_name);
- mFolderName.setOnBackKeyListener(new ExtendedEditText.OnBackKeyListener() {
- @Override
- public boolean onBackKey() {
- // Close the activity on back key press
- doneEditingFolderName(true);
- return false;
- }
- });
+ mFolderName.setOnBackKeyListener(this);
mFolderName.setOnFocusChangeListener(this);
if (!Utilities.ATLEAST_MARSHMALLOW) {
@@ -357,12 +352,9 @@
});
}
- public void dismissEditingName() {
- mInputMethodManager.hideSoftInputFromWindow(getWindowToken(), 0);
- doneEditingFolderName(true);
- }
- public void doneEditingFolderName(boolean commit) {
+ @Override
+ public boolean onBackKey() {
mFolderName.setHint(sHintText);
// Convert to a string here to ensure that no other state associated with the text field
// gets saved.
@@ -370,30 +362,30 @@
mInfo.setTitle(newTitle);
LauncherModel.updateItemInDatabase(mLauncher, mInfo);
- if (commit) {
- Utilities.sendCustomAccessibilityEvent(
- this, AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,
- getContext().getString(R.string.folder_renamed, newTitle));
- }
+ Utilities.sendCustomAccessibilityEvent(
+ this, AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED,
+ getContext().getString(R.string.folder_renamed, newTitle));
// This ensures that focus is gained every time the field is clicked, which selects all
// the text and brings up the soft keyboard if necessary.
mFolderName.clearFocus();
- Selection.setSelection((Spannable) mFolderName.getText(), 0, 0);
+ Selection.setSelection(mFolderName.getText(), 0, 0);
mIsEditingName = false;
+ return true;
}
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_DONE) {
- dismissEditingName();
+ mFolderName.dispatchBackKey();
return true;
}
return false;
}
- public View getEditTextRegion() {
- return mFolderName;
+ @Override
+ public ExtendedEditText getActiveTextView() {
+ return isEditingName() ? mFolderName : null;
}
/**
@@ -518,8 +510,33 @@
mState = STATE_SMALL;
}
+ /**
+ * Opens the user folder described by the specified tag. The opening of the folder
+ * is animated relative to the specified View. If the View is null, no animation
+ * is played.
+ */
public void animateOpen() {
- if (!(getParent() instanceof DragLayer)) return;
+ Folder openFolder = getOpen(mLauncher);
+ if (openFolder != null && openFolder != this) {
+ // Close any open folder before opening a folder.
+ openFolder.close(true);
+ }
+
+ DragLayer dragLayer = mLauncher.getDragLayer();
+ // Just verify that the folder hasn't already been added to the DragLayer.
+ // There was a one-off crash where the folder had a parent already.
+ if (getParent() == null) {
+ dragLayer.addView(this);
+ mDragController.addDropTarget(this);
+ } else {
+ if (ProviderConfig.IS_DOGFOOD_BUILD) {
+ Log.e(TAG, "Opening folder (" + this + ") which already has a parent:"
+ + getParent());
+ }
+ }
+
+ mIsOpen = true;
+ mFolderIcon.growAndFadeOut();
mContent.completePendingPageChanges();
if (!mDragInProgress) {
@@ -532,83 +549,63 @@
// dropping. One resulting issue is that replaceFolderWithFinalItem() can be called twice.
mDeleteFolderOnDropCompleted = false;
- Animator openFolderAnim = null;
final Runnable onCompleteRunnable;
- if (!Utilities.ATLEAST_LOLLIPOP) {
- positionAndSizeAsIcon();
- centerAboutIcon();
+ prepareReveal();
+ centerAboutIcon();
- final ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(this, 1, 1, 1);
- oa.setDuration(mExpandDuration);
- openFolderAnim = oa;
+ AnimatorSet anim = LauncherAnimUtils.createAnimatorSet();
+ int width = getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();
+ int height = getFolderHeight();
- setLayerType(LAYER_TYPE_HARDWARE, null);
- onCompleteRunnable = new Runnable() {
- @Override
- public void run() {
- setLayerType(LAYER_TYPE_NONE, null);
- }
- };
- } else {
- prepareReveal();
- centerAboutIcon();
+ float transX = - 0.075f * (width / 2 - getPivotX());
+ float transY = - 0.075f * (height / 2 - getPivotY());
+ setTranslationX(transX);
+ setTranslationY(transY);
+ PropertyValuesHolder tx = PropertyValuesHolder.ofFloat(TRANSLATION_X, transX, 0);
+ PropertyValuesHolder ty = PropertyValuesHolder.ofFloat(TRANSLATION_Y, transY, 0);
- AnimatorSet anim = LauncherAnimUtils.createAnimatorSet();
- int width = getPaddingLeft() + getPaddingRight() + mContent.getDesiredWidth();
- int height = getFolderHeight();
+ Animator drift = ObjectAnimator.ofPropertyValuesHolder(this, tx, ty);
+ drift.setDuration(mMaterialExpandDuration);
+ drift.setStartDelay(mMaterialExpandStagger);
+ drift.setInterpolator(new LogDecelerateInterpolator(100, 0));
- float transX = - 0.075f * (width / 2 - getPivotX());
- float transY = - 0.075f * (height / 2 - getPivotY());
- setTranslationX(transX);
- setTranslationY(transY);
- PropertyValuesHolder tx = PropertyValuesHolder.ofFloat(TRANSLATION_X, transX, 0);
- PropertyValuesHolder ty = PropertyValuesHolder.ofFloat(TRANSLATION_Y, transY, 0);
+ int rx = (int) Math.max(Math.max(width - getPivotX(), 0), getPivotX());
+ int ry = (int) Math.max(Math.max(height - getPivotY(), 0), getPivotY());
+ float radius = (float) Math.hypot(rx, ry);
- Animator drift = ObjectAnimator.ofPropertyValuesHolder(this, tx, ty);
- drift.setDuration(mMaterialExpandDuration);
- drift.setStartDelay(mMaterialExpandStagger);
- drift.setInterpolator(new LogDecelerateInterpolator(100, 0));
+ Animator reveal = new CircleRevealOutlineProvider((int) getPivotX(),
+ (int) getPivotY(), 0, radius).createRevealAnimator(this);
+ reveal.setDuration(mMaterialExpandDuration);
+ reveal.setInterpolator(new LogDecelerateInterpolator(100, 0));
- int rx = (int) Math.max(Math.max(width - getPivotX(), 0), getPivotX());
- int ry = (int) Math.max(Math.max(height - getPivotY(), 0), getPivotY());
- float radius = (float) Math.hypot(rx, ry);
+ mContent.setAlpha(0f);
+ Animator iconsAlpha = ObjectAnimator.ofFloat(mContent, "alpha", 0f, 1f);
+ iconsAlpha.setDuration(mMaterialExpandDuration);
+ iconsAlpha.setStartDelay(mMaterialExpandStagger);
+ iconsAlpha.setInterpolator(new AccelerateInterpolator(1.5f));
- Animator reveal = new CircleRevealOutlineProvider((int) getPivotX(),
- (int) getPivotY(), 0, radius).createRevealAnimator(this);
- reveal.setDuration(mMaterialExpandDuration);
- reveal.setInterpolator(new LogDecelerateInterpolator(100, 0));
+ mFooter.setAlpha(0f);
+ Animator textAlpha = ObjectAnimator.ofFloat(mFooter, "alpha", 0f, 1f);
+ textAlpha.setDuration(mMaterialExpandDuration);
+ textAlpha.setStartDelay(mMaterialExpandStagger);
+ textAlpha.setInterpolator(new AccelerateInterpolator(1.5f));
- mContent.setAlpha(0f);
- Animator iconsAlpha = ObjectAnimator.ofFloat(mContent, "alpha", 0f, 1f);
- iconsAlpha.setDuration(mMaterialExpandDuration);
- iconsAlpha.setStartDelay(mMaterialExpandStagger);
- iconsAlpha.setInterpolator(new AccelerateInterpolator(1.5f));
+ anim.play(drift);
+ anim.play(iconsAlpha);
+ anim.play(textAlpha);
+ anim.play(reveal);
- mFooter.setAlpha(0f);
- Animator textAlpha = ObjectAnimator.ofFloat(mFooter, "alpha", 0f, 1f);
- textAlpha.setDuration(mMaterialExpandDuration);
- textAlpha.setStartDelay(mMaterialExpandStagger);
- textAlpha.setInterpolator(new AccelerateInterpolator(1.5f));
-
- anim.play(drift);
- anim.play(iconsAlpha);
- anim.play(textAlpha);
- anim.play(reveal);
-
- openFolderAnim = anim;
-
- mContent.setLayerType(LAYER_TYPE_HARDWARE, null);
- mFooter.setLayerType(LAYER_TYPE_HARDWARE, null);
- onCompleteRunnable = new Runnable() {
- @Override
- public void run() {
- mContent.setLayerType(LAYER_TYPE_NONE, null);
- mFooter.setLayerType(LAYER_TYPE_NONE, null);
- mLauncher.getUserEventDispatcher().resetElapsedContainerMillis();
- }
- };
- }
- openFolderAnim.addListener(new AnimatorListenerAdapter() {
+ mContent.setLayerType(LAYER_TYPE_HARDWARE, null);
+ mFooter.setLayerType(LAYER_TYPE_HARDWARE, null);
+ onCompleteRunnable = new Runnable() {
+ @Override
+ public void run() {
+ mContent.setLayerType(LAYER_TYPE_NONE, null);
+ mFooter.setLayerType(LAYER_TYPE_NONE, null);
+ mLauncher.getUserEventDispatcher().resetElapsedContainerMillis();
+ }
+ };
+ anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
Utilities.sendCustomAccessibilityEvent(
@@ -639,7 +636,7 @@
// Do not update the flag if we are in drag mode. The flag will be updated, when we
// actually drop the icon.
final boolean updateAnimationFlag = !mDragInProgress;
- openFolderAnim.addListener(new AnimatorListenerAdapter() {
+ anim.addListener(new AnimatorListenerAdapter() {
@SuppressLint("InlinedApi")
@Override
@@ -662,7 +659,7 @@
}
mPageIndicator.stopAllAnimations();
- openFolderAnim.start();
+ anim.start();
// Make sure the folder picks up the last drag move even if the finger doesn't move.
if (mDragController.isDragging()) {
@@ -670,6 +667,11 @@
}
mContent.verifyVisibleHighResIcons(mContent.getNextPage());
+
+ // Notify the accessibility manager that this folder "window" has appeared and occluded
+ // the workspace items
+ sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+ dragLayer.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
}
public void beginExternalDrag() {
@@ -682,14 +684,44 @@
mDragController.addDragListener(this);
}
- public void animateClosed() {
+ @Override
+ protected boolean isOfType(int type) {
+ return (type & TYPE_FOLDER) != 0;
+ }
+
+ @Override
+ protected void handleClose(boolean animate) {
+ mIsOpen = false;
+
+ if (isEditingName()) {
+ mFolderName.dispatchBackKey();
+ }
+
+ if (mFolderIcon != null) {
+ mFolderIcon.shrinkAndFadeIn(animate);
+ }
+
if (!(getParent() instanceof DragLayer)) return;
+
+ if (animate) {
+ animateClosed();
+ } else {
+ closeComplete(false);
+ }
+
+ // Notify the accessibility manager that this folder "window" has disappeared and no
+ // longer occludes the workspace items
+ ((DragLayer) getParent())
+ .sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+ }
+
+ private void animateClosed() {
final ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(this, 0, 0.9f, 0.9f);
oa.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
setLayerType(LAYER_TYPE_NONE, null);
- close(true);
+ closeComplete(true);
}
@Override
public void onAnimationStart(Animator animation) {
@@ -705,7 +737,7 @@
oa.start();
}
- public void close(boolean wasAnimated) {
+ private void closeComplete(boolean wasAnimated) {
// TODO: Clear all active animations.
DragLayer parent = (DragLayer) getParent();
if (parent != null) {
@@ -840,8 +872,8 @@
};
public void completeDragExit() {
- if (mInfo.opened) {
- mLauncher.closeFolder();
+ if (mIsOpen) {
+ close(true);
mRearrangeOnClose = true;
} else if (mState == STATE_ANIMATING) {
mRearrangeOnClose = true;
@@ -1370,8 +1402,8 @@
rearrangeChildren();
}
if (getItemCount() <= 1) {
- if (mInfo.opened) {
- mLauncher.closeFolder(this, true);
+ if (mIsOpen) {
+ close(true);
} else {
replaceFolderWithFinalItem();
}
@@ -1417,7 +1449,7 @@
if (hasFocus) {
startEditingFolderName();
} else {
- dismissEditingName();
+ mFolderName.dispatchBackKey();
}
}
}
@@ -1430,7 +1462,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
target.gridX = info.cellX;
target.gridY = info.cellY;
target.pageIndex = mContent.getCurrentPage();
@@ -1516,4 +1548,11 @@
updateTextViewFocus();
}
}
+
+ /**
+ * Returns a folder which is already open or null
+ */
+ public static Folder getOpen(Launcher launcher) {
+ return getOpenView(launcher, TYPE_FOLDER);
+ }
}
diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 69c2b0f..a29a946 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -18,6 +18,7 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.animation.ValueAnimator.AnimatorUpdateListener;
import android.content.Context;
@@ -56,7 +57,6 @@
import com.android.launcher3.ItemInfo;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherAnimUtils;
-import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.OnAlarmListener;
import com.android.launcher3.PreloadIconDrawable;
@@ -142,6 +142,7 @@
mPreviewLayoutRule = FeatureFlags.LAUNCHER3_LEGACY_FOLDER_ICON ?
new StackFolderIconLayoutRule() :
new ClippedFolderIconLayoutRule();
+ mSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
}
public static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group,
@@ -202,16 +203,12 @@
updateItemDrawingParams(false);
}
- public FolderInfo getFolderInfo() {
- return mInfo;
- }
-
private boolean willAcceptItem(ItemInfo item) {
final int itemType = item.itemType;
return ((itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT ||
itemType == LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT) &&
- !mFolder.isFull() && item != mInfo && !mInfo.opened);
+ !mFolder.isFull() && item != mInfo && !mFolder.isOpen());
}
public boolean acceptDrop(ItemInfo dragInfo) {
@@ -243,7 +240,7 @@
OnAlarmListener mOnOpenListener = new OnAlarmListener() {
public void onAlarm(Alarm alarm) {
mFolder.beginExternalDrag();
- mLauncher.openFolder(FolderIcon.this);
+ mFolder.animateOpen();
}
};
@@ -974,12 +971,6 @@
}
@Override
- protected void onAttachedToWindow() {
- super.onAttachedToWindow();
- mSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
- }
-
- @Override
public void cancelLongPress() {
super.cancelLongPress();
mLongPressHelper.cancelLongPress();
@@ -990,13 +981,76 @@
mInfo.removeListener(mFolder);
}
+ public void shrinkAndFadeIn(boolean animate) {
+ final CellLayout cl = (CellLayout) getParent().getParent();
+ ((CellLayout.LayoutParams) getLayoutParams()).canReorder = true;
+
+ // We remove and re-draw the FolderIcon in-case it has changed
+ final PreviewImageView previewImage = PreviewImageView.get(getContext());
+ previewImage.removeFromParent();
+ copyToPreview(previewImage);
+
+ if (cl != null) {
+ cl.clearFolderLeaveBehind();
+ }
+
+ ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(previewImage, 1, 1, 1);
+ oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
+ oa.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ if (cl != null) {
+ // Remove the ImageView copy of the FolderIcon and make the original visible.
+ previewImage.removeFromParent();
+ setVisibility(View.VISIBLE);
+ }
+ }
+ });
+ oa.start();
+ if (!animate) {
+ oa.end();
+ }
+ }
+
+ public void growAndFadeOut() {
+ CellLayout.LayoutParams lp = (CellLayout.LayoutParams) getLayoutParams();
+ // While the folder is open, the position of the icon cannot change.
+ lp.canReorder = false;
+ if (mInfo.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) {
+ CellLayout cl = (CellLayout) getParent().getParent();
+ cl.setFolderLeaveBehindCell(lp.cellX, lp.cellY);
+ }
+
+ // Push an ImageView copy of the FolderIcon into the DragLayer and hide the original
+ PreviewImageView previewImage = PreviewImageView.get(getContext());
+ copyToPreview(previewImage);
+ setVisibility(View.INVISIBLE);
+
+ ObjectAnimator oa = LauncherAnimUtils.ofViewAlphaAndScale(previewImage, 0, 1.5f, 1.5f);
+ oa.setDuration(getResources().getInteger(R.integer.config_folderExpandDuration));
+ oa.start();
+ }
+
+ /**
+ * This method draws the FolderIcon to an ImageView and then adds and positions that ImageView
+ * in the DragLayer in the exact absolute location of the original FolderIcon.
+ */
+ private void copyToPreview(PreviewImageView previewImageView) {
+ previewImageView.copy(this);
+ if (mFolder != null) {
+ previewImageView.setPivotX(mFolder.getPivotXForIconAnimation());
+ previewImageView.setPivotY(mFolder.getPivotYForIconAnimation());
+ mFolder.bringToFront();
+ }
+ }
+
public interface PreviewLayoutRule {
- public PreviewItemDrawingParams computePreviewItemDrawingParams(int index, int curNumItems,
+ PreviewItemDrawingParams computePreviewItemDrawingParams(int index, int curNumItems,
PreviewItemDrawingParams params);
- public void init(int availableSpace, int intrinsicIconSize, boolean rtl);
+ void init(int availableSpace, int intrinsicIconSize, boolean rtl);
- public int numItems();
- public boolean clipToBackground();
+ int numItems();
+ boolean clipToBackground();
}
}
diff --git a/src/com/android/launcher3/folder/PreviewImageView.java b/src/com/android/launcher3/folder/PreviewImageView.java
new file mode 100644
index 0000000..c4f3ee1
--- /dev/null
+++ b/src/com/android/launcher3/folder/PreviewImageView.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2016 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.folder;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.dragndrop.DragLayer;
+
+/**
+ * A temporary view which displays the a bitmap (used for folder icon animation)
+ */
+public class PreviewImageView extends ImageView {
+
+ private final Rect mTempRect = new Rect();
+ private final DragLayer mParent;
+
+ private Bitmap mBitmap;
+ private Canvas mCanvas;
+
+ public PreviewImageView(DragLayer parent) {
+ super(parent.getContext());
+ mParent = parent;
+ }
+
+ public void copy(View view) {
+ final int width = view.getMeasuredWidth();
+ final int height = view.getMeasuredHeight();
+
+ if (mBitmap == null || mBitmap.getWidth() != width || mBitmap.getHeight() != height) {
+ mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+ mCanvas = new Canvas(mBitmap);
+ }
+
+ DragLayer.LayoutParams lp;
+ if (getLayoutParams() instanceof DragLayer.LayoutParams) {
+ lp = (DragLayer.LayoutParams) getLayoutParams();
+ } else {
+ lp = new DragLayer.LayoutParams(width, height);
+ }
+
+ // The layout from which the folder is being opened may be scaled, adjust the starting
+ // view size by this scale factor.
+ float scale = mParent.getDescendantRectRelativeToSelf(view, mTempRect);
+ lp.customPosition = true;
+ lp.x = mTempRect.left;
+ lp.y = mTempRect.top;
+ lp.width = (int) (scale * width);
+ lp.height = (int) (scale * height);
+
+ mCanvas.drawColor(0, PorterDuff.Mode.CLEAR);
+ view.draw(mCanvas);
+ setImageBitmap(mBitmap);
+
+ // Just in case this image view is still in the drag layer from a previous animation,
+ // we remove it and re-add it.
+ removeFromParent();
+ mParent.addView(this, lp);
+ }
+
+ public void removeFromParent() {
+ if (mParent.indexOfChild(this) != -1) {
+ mParent.removeView(this);
+ }
+ }
+
+ public static PreviewImageView get(Context context) {
+ DragLayer dragLayer = Launcher.getLauncher(context).getDragLayer();
+ PreviewImageView view = (PreviewImageView) dragLayer.getTag(R.id.preview_image_id);
+ if (view == null) {
+ view = new PreviewImageView(dragLayer);
+ dragLayer.setTag(R.id.preview_image_id, view);
+ }
+ return view;
+ }
+}
diff --git a/src/com/android/launcher3/keyboard/CustomActionsPopup.java b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
index 6056f4c..6603e93 100644
--- a/src/com/android/launcher3/keyboard/CustomActionsPopup.java
+++ b/src/com/android/launcher3/keyboard/CustomActionsPopup.java
@@ -46,7 +46,7 @@
public CustomActionsPopup(Launcher launcher, View icon) {
mLauncher = launcher;
mIcon = icon;
- DeepShortcutsContainer container = launcher.getOpenShortcutsContainer();
+ DeepShortcutsContainer container = DeepShortcutsContainer.getOpen(launcher);
if (container != null) {
mDelegate = container.getAccessibilityDelegate();
} else {
diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index 8c702bf..441d8e5 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -48,13 +48,9 @@
private final boolean mIsVerbose;
/**
- * TODO: change the name of this interface to LogContainerProvider
- * and the method name to fillInLogContainerData. Not changed to minimize CL diff
- * in this branch.
- *
- * Implemented by containers to provide a launch source for a given child.
+ * Implemented by containers to provide a container source for a given child.
*/
- public interface LaunchSourceProvider {
+ public interface LogContainerProvider {
/**
* Copies data from the source to the destination proto.
@@ -64,13 +60,13 @@
* @param target dest of the data
* @param targetParent dest of the data
*/
- void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent);
+ void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent);
}
/**
* Recursively finds the parent of the given child which implements IconLogInfoProvider
*/
- public static LaunchSourceProvider getLaunchProviderRecursive(View v) {
+ public static LogContainerProvider getLaunchProviderRecursive(View v) {
ViewParent parent = null;
if (v != null) {
@@ -82,8 +78,8 @@
// Optimization to only check up to 5 parents.
int count = MAXIMUM_VIEW_HIERARCHY_LEVEL;
while (parent != null && count-- > 0) {
- if (parent instanceof LaunchSourceProvider) {
- return (LaunchSourceProvider) parent;
+ if (parent instanceof LogContainerProvider) {
+ return (LogContainerProvider) parent;
} else {
parent = parent.getParent();
}
@@ -123,12 +119,12 @@
// Fill in grid(x,y), pageIndex of the child and container type of the parent
// TODO: make this percolate up the view hierarchy if needed.
int idx = 0;
- LaunchSourceProvider provider = getLaunchProviderRecursive(v);
+ LogContainerProvider provider = getLaunchProviderRecursive(v);
if (v == null || !(v.getTag() instanceof ItemInfo) || provider == null) {
return null;
}
ItemInfo itemInfo = (ItemInfo) v.getTag();
- provider.fillInLaunchSourceData(v, itemInfo, event.srcTarget[idx], event.srcTarget[idx + 1]);
+ provider.fillInLogContainerData(v, itemInfo, event.srcTarget[idx], event.srcTarget[idx + 1]);
event.srcTarget[idx].intentHash = intent.hashCode();
ComponentName cn = intent.getComponent();
@@ -181,12 +177,12 @@
public void logDeepShortcutsOpen(View icon) {
LauncherEvent event = LoggerUtils.initLauncherEvent(
Action.TOUCH, icon, Target.CONTAINER);
- LaunchSourceProvider provider = getLaunchProviderRecursive(icon);
+ LogContainerProvider provider = getLaunchProviderRecursive(icon);
if (icon == null && !(icon.getTag() instanceof ItemInfo)) {
return;
}
ItemInfo info = (ItemInfo) icon.getTag();
- provider.fillInLaunchSourceData(icon, info, event.srcTarget[0], event.srcTarget[1]);
+ provider.fillInLogContainerData(icon, info, event.srcTarget[0], event.srcTarget[1]);
event.action.touch = Action.LONGPRESS;
dispatchUserEvent(event, null);
@@ -205,11 +201,11 @@
dropTargetAsView);
event.action.touch = Action.DRAGDROP;
- dragObj.dragSource.fillInLaunchSourceData(null, dragObj.originalDragInfo,
+ dragObj.dragSource.fillInLogContainerData(null, dragObj.originalDragInfo,
event.srcTarget[0], event.srcTarget[1]);
- if (dropTargetAsView instanceof LaunchSourceProvider) {
- ((LaunchSourceProvider) dropTargetAsView).fillInLaunchSourceData(null,
+ if (dropTargetAsView instanceof LogContainerProvider) {
+ ((LogContainerProvider) dropTargetAsView).fillInLogContainerData(null,
dragObj.dragInfo, event.destTarget[0], event.destTarget[1]);
}
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 2b70399..c18eeef 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -24,13 +24,19 @@
import com.android.launcher3.LauncherAppWidgetInfo;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.ShortcutInfo;
+import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.config.ProviderConfig;
+import com.android.launcher3.shortcuts.ShortcutInfoCompat;
import com.android.launcher3.shortcuts.ShortcutKey;
+import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.LongArrayMap;
+import com.android.launcher3.util.MultiHashMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
/**
@@ -73,6 +79,11 @@
public final Map<ShortcutKey, MutableInt> pinnedShortcutCounts = new HashMap<>();
/**
+ * Maps all launcher activities to the id's of their shortcuts (if they have any).
+ */
+ public final MultiHashMap<ComponentKey, String> deepShortcutMap = new MultiHashMap<>();
+
+ /**
* Clears all the data
*/
public synchronized void clear() {
@@ -82,6 +93,7 @@
itemsIdMap.clear();
workspaceScreens.clear();
pinnedShortcutCounts.clear();
+ deepShortcutMap.clear();
}
public synchronized void removeItem(ItemInfo... items) {
@@ -194,4 +206,32 @@
}
return folderInfo;
}
+
+ /**
+ * Clear all the deep shortcuts for the given package, and re-add the new shortcuts.
+ */
+ public synchronized void updateDeepShortcutMap(
+ String packageName, UserHandleCompat user, List<ShortcutInfoCompat> shortcuts) {
+ if (packageName != null) {
+ Iterator<ComponentKey> keysIter = deepShortcutMap.keySet().iterator();
+ while (keysIter.hasNext()) {
+ ComponentKey next = keysIter.next();
+ if (next.componentName.getPackageName().equals(packageName)
+ && next.user.equals(user)) {
+ keysIter.remove();
+ }
+ }
+ }
+
+ // Now add the new shortcuts to the map.
+ for (ShortcutInfoCompat shortcut : shortcuts) {
+ boolean shouldShowInContainer = shortcut.isEnabled()
+ && (shortcut.isDeclaredInManifest() || shortcut.isDynamic());
+ if (shouldShowInContainer) {
+ ComponentKey targetComponent
+ = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle());
+ deepShortcutMap.addToList(targetComponent, shortcut.getId());
+ }
+ }
+ }
}
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index 31f3823..b5126e9 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -41,6 +41,7 @@
import android.view.animation.DecelerateInterpolator;
import android.widget.LinearLayout;
+import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
@@ -73,9 +74,9 @@
* A container for shortcuts to deep links within apps.
*/
@TargetApi(Build.VERSION_CODES.N)
-public class DeepShortcutsContainer extends LinearLayout implements View.OnLongClickListener,
+public class DeepShortcutsContainer extends AbstractFloatingView
+ implements View.OnLongClickListener,
View.OnTouchListener, DragSource, DragController.DragListener {
- private static final String TAG = "ShortcutsContainer";
private final Point mIconShift = new Point();
@@ -94,7 +95,6 @@
private Animator mOpenCloseAnimator;
private boolean mDeferContainerRemoval;
- private boolean mIsOpen;
public DeepShortcutsContainer(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
@@ -376,7 +376,8 @@
return arrowView;
}
- public BubbleTextView getOriginalIcon() {
+ @Override
+ public View getExtendedTouchView() {
return mOriginalIcon;
}
@@ -444,7 +445,7 @@
dv.animateShift(-mIconShift.x, -mIconShift.y);
// TODO: support dragging from within folder without having to close it
- mLauncher.closeFolder();
+ AbstractFloatingView.closeOpenContainer(mLauncher, AbstractFloatingView.TYPE_FOLDER);
return false;
}
@@ -499,20 +500,29 @@
} else {
// Close animation is not running.
if (mDeferContainerRemoval) {
- close();
+ closeComplete();
}
}
}
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
target.itemType = LauncherLogProto.DEEPSHORTCUT;
// TODO: add target.rank
targetParent.containerType = LauncherLogProto.DEEPSHORTCUTS;
}
- public void animateClose() {
+ @Override
+ protected void handleClose(boolean animate) {
+ if (animate) {
+ animateClose();
+ } else {
+ closeComplete();
+ }
+ }
+
+ private void animateClose() {
if (!mIsOpen) {
return;
}
@@ -592,7 +602,7 @@
if (mDeferContainerRemoval) {
setVisibility(INVISIBLE);
} else {
- close();
+ closeComplete();
}
}
});
@@ -607,7 +617,7 @@
/**
* Closes the folder without animation.
*/
- public void close() {
+ private void closeComplete() {
if (mOpenCloseAnimator != null) {
mOpenCloseAnimator.cancel();
mOpenCloseAnimator = null;
@@ -621,8 +631,9 @@
mLauncher.getDragLayer().removeView(this);
}
- public boolean isOpen() {
- return mIsOpen;
+ @Override
+ protected boolean isOfType(int type) {
+ return (type & TYPE_DEEPSHORTCUT_CONTAINER) != 0;
}
/**
@@ -631,7 +642,7 @@
*/
public static DeepShortcutsContainer showForIcon(BubbleTextView icon) {
Launcher launcher = Launcher.getLauncher(icon.getContext());
- if (launcher.getOpenShortcutsContainer() != null) {
+ if (getOpen(launcher) != null) {
// There is already a shortcuts container open, so don't open this one.
icon.clearFocus();
return null;
@@ -666,4 +677,11 @@
return unbadgedBitmap;
}
}
+
+ /**
+ * Returns a DeepShortcutsContainer which is already open or null
+ */
+ public static DeepShortcutsContainer getOpen(Launcher launcher) {
+ return getOpenView(launcher, TYPE_DEEPSHORTCUT_CONTAINER);
+ }
}
diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java
index 07c8e38..ecc853d 100644
--- a/src/com/android/launcher3/widget/WidgetsContainerView.java
+++ b/src/com/android/launcher3/widget/WidgetsContainerView.java
@@ -338,7 +338,7 @@
}
@Override
- public void fillInLaunchSourceData(View v, ItemInfo info, Target target, Target targetParent) {
+ public void fillInLogContainerData(View v, ItemInfo info, Target target, Target targetParent) {
targetParent.containerType = LauncherLogProto.WIDGETS;
}
}
\ No newline at end of file