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

Unverified Commit 9814de7c authored by Nebojsa Cvetkovic's avatar Nebojsa Cvetkovic Committed by Michael Bestas
Browse files

Workspace: Allow resizing any widget 



[BadDaemon: Adapt for S]

Change-Id: Iba122eb45d4ba81e53267ff341addfe281cf02fe
Signed-off-by: default avatarJoey Rizzoli <joey@lineageos.org>
parent 136729c9

src/com/android/launcher3/AppWidgetResizeFrame.java

+4 −24
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.appwidget.AppWidgetProviderInfo;

import android.content.Context;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;
@@ -238,23 +237,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
        mWidgetPadding = getDefaultPaddingForWidget(getContext(),

                widgetView.getAppWidgetInfo().provider, null);



        // Only show resize handles for the directions in which resizing is possible.

        InvariantDeviceProfile idp = LauncherAppState.getIDP(cellLayout.getContext());

        mVerticalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0

                && mMinVSpan < idp.numRows && mMaxVSpan > 1

                && mMinVSpan < mMaxVSpan;

        if (!mVerticalResizeActive) {

            mDragHandles[INDEX_TOP].setVisibility(GONE);

            mDragHandles[INDEX_BOTTOM].setVisibility(GONE);

        }

        mHorizontalResizeActive = (info.resizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0

                && mMinHSpan < idp.numColumns && mMaxHSpan > 1

                && mMinHSpan < mMaxHSpan;

        if (!mHorizontalResizeActive) {

            mDragHandles[INDEX_LEFT].setVisibility(GONE);

            mDragHandles[INDEX_RIGHT].setVisibility(GONE);

        }



        mReconfigureButton = (ImageButton) findViewById(R.id.widget_reconfigure_button);

        if (info.isReconfigurable()) {

            mReconfigureButton.setVisibility(VISIBLE);
@@ -307,12 +289,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
    }



    public boolean beginResizeIfPointInRegion(int x, int y) {

        mLeftBorderActive = (x < mTouchTargetWidth) && mHorizontalResizeActive;

        mRightBorderActive = (x > getWidth() - mTouchTargetWidth) && mHorizontalResizeActive;

        mTopBorderActive = (y < mTouchTargetWidth + mTopTouchRegionAdjustment)

                && mVerticalResizeActive;

        mBottomBorderActive = (y > getHeight() - mTouchTargetWidth + mBottomTouchRegionAdjustment)

                && mVerticalResizeActive;

        mLeftBorderActive = x < mTouchTargetWidth;

        mRightBorderActive = x > getWidth() - mTouchTargetWidth;

        mTopBorderActive = y < mTouchTargetWidth + mTopTouchRegionAdjustment;

        mBottomBorderActive = y > getHeight() - mTouchTargetWidth + mBottomTouchRegionAdjustment;



        boolean anyBordersActive = mLeftBorderActive || mRightBorderActive

                || mTopBorderActive || mBottomBorderActive;

src/com/android/launcher3/Workspace.java

+1 −2
Original line number Diff line number Diff line
@@ -2078,8 +2078,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


                        final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;

                        AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();

                        if (pInfo != null && pInfo.resizeMode != AppWidgetProviderInfo.RESIZE_NONE

                                && !options.isAccessibleDrag) {

                        if (pInfo != null && !options.isAccessibleDrag) {

                            onCompleteRunnable = () -> {

                                if (!isPageInTransition()) {

                                    AppWidgetResizeFrame.showForWidget(hostView, cellLayout);