Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63365cf0 authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Fix drag-n-drop from the pin widget flow" into sc-dev

parents b7a93628 ca24216c

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

+5 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);