Improving widget handling for pinItemRequest (8a0dc38a) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/Launcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2109,7 +2109,7 @@ public class Launcher extends BaseActivity
		private void addAppWidgetFromDrop(PendingAddWidgetInfo info) {
		AppWidgetHostView hostView = info.boundWidget;
		int appWidgetId;
		WidgetAddFlowHandler addFlowHandler = info.getHander();
		WidgetAddFlowHandler addFlowHandler = info.getHandler();
		if (hostView != null) {
		// In the case where we've prebound the widget, we remove it from the DragLayer
		if (LOGD) {

src/com/android/launcher3/dragndrop/PinItemDragListener.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.launcher3.widget.PendingAddShortcutInfo;
		import com.android.launcher3.widget.PendingAddWidgetInfo;
		import com.android.launcher3.widget.PendingItemPreviewProvider;
		import com.android.launcher3.widget.WidgetAddFlowHandler;
		import com.android.launcher3.widget.WidgetHostViewLoader;

		import java.util.UUID;

		@@ -141,6 +143,7 @@ public class PinItemDragListener implements Parcelable, View.OnDragListener, Dra

		final PendingAddItemInfo item;
		final Bitmap preview;
		final View view = new View(mLauncher);

		Point dragShift = new Point(mPreviewRect.left, mPreviewRect.top);
		if (mRequest.getRequestType() == PinItemRequestCompat.REQUEST_TYPE_SHORTCUT) {
		@@ -160,9 +163,18 @@ public class PinItemDragListener implements Parcelable, View.OnDragListener, Dra
		(size[1] - icon.getHeight() - dp.iconTextSizePx - dp.iconDrawablePaddingPx) / 2,
		new Paint(Paint.FILTER_BITMAP_FLAG));
		} else {
		PendingAddWidgetInfo info = new PendingAddWidgetInfo(
		// mRequest.getRequestType() == PinItemRequestCompat.REQUEST_TYPE_APPWIDGET
		LauncherAppWidgetProviderInfo providerInfo =
		LauncherAppWidgetProviderInfo.fromProviderInfo(
		mLauncher, mRequest.getAppWidgetProviderInfo(mLauncher)));
		mLauncher, mRequest.getAppWidgetProviderInfo(mLauncher));
		final PinWidgetFlowHandler flowHandler =
		new PinWidgetFlowHandler(providerInfo, mRequest);
		PendingAddWidgetInfo info = new PendingAddWidgetInfo(providerInfo) {
		@Override
		public WidgetAddFlowHandler getHandler() {
		return flowHandler;
		}
		};
		int[] size = mLauncher.getWorkspace().estimateItemSize(info, true, false);

		float minScale = 1.25f;
		@@ -176,10 +188,13 @@ public class PinItemDragListener implements Parcelable, View.OnDragListener, Dra
		(mPreviewRect.width() - preview.getWidth()) / 2,
		(mPreviewRect.height() - preview.getHeight()) / 2);
		item = info;

		view.setTag(info);
		mDragController.addDragListener(new WidgetHostViewLoader(mLauncher, view));
		}

		PendingItemPreviewProvider previewProvider =
		new PendingItemPreviewProvider(new View(mLauncher), item, preview);
		new PendingItemPreviewProvider(view, item, preview);

		// Since we are not going through the workspace for starting the drag, set drag related
		// information on the workspace before starting the drag.

src/com/android/launcher3/dragndrop/PinWidgetFlowHandler.java

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.launcher3.dragndrop;

		import android.appwidget.AppWidgetManager;
		import android.appwidget.AppWidgetProviderInfo;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;

		import com.android.launcher3.ItemInfo;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.compat.PinItemRequestCompat;
		import com.android.launcher3.widget.WidgetAddFlowHandler;

		/**
		* Extension of WidgetAddFlowHandler to handle pin item request behavior.
		*
		* No config activity is shown even if it is defined in widget config. And a callback is sent when
		* the widget is bound.
		*/
		public class PinWidgetFlowHandler extends WidgetAddFlowHandler implements Parcelable {

		private final PinItemRequestCompat mRequest;

		public PinWidgetFlowHandler(AppWidgetProviderInfo providerInfo, PinItemRequestCompat request) {
		super(providerInfo);
		mRequest = request;
		}

		protected PinWidgetFlowHandler(Parcel parcel) {
		super(parcel);
		mRequest = PinItemRequestCompat.CREATOR.createFromParcel(parcel);
		}

		@Override
		public void writeToParcel(Parcel parcel, int i) {
		super.writeToParcel(parcel, i);
		mRequest.writeToParcel(parcel, i);
		}

		@Override
		public boolean startConfigActivity(Launcher launcher, int appWidgetId, ItemInfo info,
		int requestCode) {
		Bundle extras = new Bundle();
		extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
		mRequest.accept(extras);
		return false;
		}

		@Override
		public boolean needsConfigure() {
		return false;
		}

		public static final Parcelable.Creator<PinWidgetFlowHandler> CREATOR =
		new Parcelable.Creator<PinWidgetFlowHandler>() {
		public PinWidgetFlowHandler createFromParcel(Parcel source) {
		return new PinWidgetFlowHandler(source);
		}

		public PinWidgetFlowHandler[] newArray(int size) {
		return new PinWidgetFlowHandler[size];
		}
		};
		}

src/com/android/launcher3/widget/PendingAddWidgetInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class PendingAddWidgetInfo extends PendingAddItemInfo {
		minSpanY = i.minSpanY;
		}

		public WidgetAddFlowHandler getHander() {
		public WidgetAddFlowHandler getHandler() {
		return new WidgetAddFlowHandler(info);
		}
		}

src/com/android/launcher3/widget/WidgetAddFlowHandler.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ public class WidgetAddFlowHandler implements Parcelable {
		mProviderInfo = providerInfo;
		}

		private WidgetAddFlowHandler(Parcel parcel) {
		protected WidgetAddFlowHandler(Parcel parcel) {
		mProviderInfo = AppWidgetProviderInfo.CREATOR.createFromParcel(parcel);
		}

		@@ -81,7 +81,7 @@ public class WidgetAddFlowHandler implements Parcelable {
		*/
		public boolean startConfigActivity(Launcher launcher, int appWidgetId, ItemInfo info,
		int requestCode) {
		if (mProviderInfo.configure == null) {
		if (!needsConfigure()) {
		return false;
		}
		launcher.setWaitingForResult(PendingRequestArgs.forWidgetInfo(appWidgetId, this, info));
		@@ -91,6 +91,10 @@ public class WidgetAddFlowHandler implements Parcelable {
		return true;
		}

		public boolean needsConfigure() {
		return mProviderInfo.configure != null;
		}

		public LauncherAppWidgetProviderInfo getProviderInfo(Context context) {
		return LauncherAppWidgetProviderInfo.fromProviderInfo(context, mProviderInfo);
		}