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

Commit b63fd251 authored by Nebojsa Cvetkovic's avatar Nebojsa Cvetkovic Committed by Bruno Martins
Browse files

Workspace: Allow resizing any widget 



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

src/com/android/launcher3/AppWidgetResizeFrame.java

+4 −20
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ import android.animation.AnimatorSet; 
import android.animation.ObjectAnimator;

import android.animation.PropertyValuesHolder;

import android.appwidget.AppWidgetHostView;

import android.appwidget.AppWidgetProviderInfo;

import android.content.Context;

import android.graphics.Point;

import android.graphics.Rect;
@@ -76,8 +75,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
    private boolean mTopBorderActive;

    private boolean mBottomBorderActive;



    private int mResizeMode;



    private int mRunningHInc;

    private int mRunningVInc;

    private int mMinHSpan;
@@ -160,7 +157,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
        mWidgetView = widgetView;

        LauncherAppWidgetProviderInfo info = (LauncherAppWidgetProviderInfo)

                widgetView.getAppWidgetInfo();

        mResizeMode = info.resizeMode;

        mDragLayer = dragLayer;



        mMinHSpan = info.minSpanX;
@@ -169,14 +165,6 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
        mWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(getContext(),

                widgetView.getAppWidgetInfo().provider, null);



        if (mResizeMode == AppWidgetProviderInfo.RESIZE_HORIZONTAL) {

            mDragHandles[INDEX_TOP].setVisibility(GONE);

            mDragHandles[INDEX_BOTTOM].setVisibility(GONE);

        } else if (mResizeMode == AppWidgetProviderInfo.RESIZE_VERTICAL) {

            mDragHandles[INDEX_LEFT].setVisibility(GONE);

            mDragHandles[INDEX_RIGHT].setVisibility(GONE);

        }



        // When we create the resize frame, we first mark all cells as unoccupied. The appropriate

        // cells (same if not resized, or different) will be marked as occupied when the resize

        // frame is dismissed.
@@ -186,14 +174,10 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O 
    }



    public boolean beginResizeIfPointInRegion(int x, int y) {

        boolean horizontalActive = (mResizeMode & AppWidgetProviderInfo.RESIZE_HORIZONTAL) != 0;

        boolean verticalActive = (mResizeMode & AppWidgetProviderInfo.RESIZE_VERTICAL) != 0;



        mLeftBorderActive = (x < mTouchTargetWidth) && horizontalActive;

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

        mTopBorderActive = (y < mTouchTargetWidth + mTopTouchRegionAdjustment) && verticalActive;

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

                && verticalActive;

        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
@@ -1872,8 +1872,7 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 


                        final LauncherAppWidgetHostView hostView = (LauncherAppWidgetHostView) cell;

                        AppWidgetProviderInfo pInfo = hostView.getAppWidgetInfo();

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

                                && !d.accessibleDrag) {

                        if (pInfo != null && !d.accessibleDrag) {

                            onCompleteRunnable = new Runnable() {

                                public void run() {

                                    if (!isPageInTransition()) {