PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge "Fix drag-n-drop from the pin widget flow" into sc-dev am: 63365cf034

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14167730

Change-Id: I17deda33cb4250a493d92be5d4b6b0bfa4aba0dc
This commit is contained in:
Steven Ng
2021-04-14 09:28:39 +00:00
committed by Automerger Merge Worker
parent c2434d052d 63365cf034
commit c76b3f31ad
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/dragndrop/AddItemActivity.java
+5 -3
View File
@@ -62,6 +62,7 @@ import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
import com.android.launcher3.widget.PendingAddShortcutInfo;
import com.android.launcher3.widget.PendingAddWidgetInfo;
import com.android.launcher3.widget.WidgetCell;
import com.android.launcher3.widget.WidgetCellPreview;
import com.android.launcher3.widget.WidgetHostViewLoader;
import com.android.launcher3.widget.WidgetImageView;
import com.android.launcher3.widget.WidgetManagerHelper;
@@ -121,9 +122,10 @@ public class AddItemActivity extends BaseActivity implements OnLongClickListener
}
}
WidgetImageView preview = mWidgetCell.findViewById(R.id.widget_preview);
preview.setOnTouchListener(this);
preview.setOnLongClickListener(this);
WidgetCellPreview previewContainer = mWidgetCell.findViewById(
R.id.widget_preview_container);
previewContainer.setOnTouchListener(this);
previewContainer.setOnLongClickListener(this);
// savedInstanceState is null when the activity is created the first time (i.e., avoids
// duplicate logging during rotation)
src/com/android/launcher3/widget/WidgetsBottomSheet.java
+3 -3
View File
@@ -170,9 +170,9 @@ public class WidgetsBottomSheet extends BaseWidgetSheet implements Insettable {
WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
.inflate(R.layout.widget_cell, parent, false);
View preview_container = widget.findViewById(R.id.widget_preview_container);
preview_container.setOnClickListener(this);
preview_container.setOnLongClickListener(this);
View previewContainer = widget.findViewById(R.id.widget_preview_container);
previewContainer.setOnClickListener(this);
previewContainer.setOnLongClickListener(this);
widget.setAnimatePreview(false);
parent.addView(widget);