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

Commit 2a51fc64 authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge "Fix issue that widgets with config activity jump" into main

parents 926a10a3 9f2a4fe8

src/com/android/launcher3/AppWidgetResizeFrame.java

+6 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.launcher3.util.PendingRequestArgs; 
import com.android.launcher3.views.ArrowTipView;

import com.android.launcher3.widget.LauncherAppWidgetHostView;

import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;

import com.android.launcher3.widget.PendingAppWidgetHostView;

import com.android.launcher3.widget.util.WidgetSizes;



import java.util.ArrayList;
@@ -474,8 +475,11 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
            mLastDirectionVector[1] = mDirectionVector[1];

        }



        if (mCellLayout.createAreaForResize(cellX, cellY, spanX, spanY, mWidgetView,

                mDirectionVector, onDismiss)) {

        // We don't want to evaluate resize if a widget was pending config activity and was already

        // occupying a space on the screen. This otherwise will cause reorder algorithm evaluate a

        // different location for the widget and cause a jump.

        if (!(mWidgetView instanceof PendingAppWidgetHostView) && mCellLayout.createAreaForResize(

                cellX, cellY, spanX, spanY, mWidgetView, mDirectionVector, onDismiss)) {

            if (mStateAnnouncer != null && (lp.cellHSpan != spanX || lp.cellVSpan != spanY) ) {

                mStateAnnouncer.announce(

                        mLauncher.getString(R.string.widget_resized, spanX, spanY));