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

Commit 35fe7be5 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing some deprecated code around page layers 

1) setChildrenDrawnWithCacheEnabled: deprecated
2) Removing custom logic based on isHardwareAccelerated. This check was not being
used consistantly everywhere

Bug: 29761236
Change-Id: Ic4a9c764f154497e376e37de2351fe04d1b48500
parent d1f03470

src/com/android/launcher3/CellLayout.java

+0 −10
Original line number Diff line number Diff line
@@ -930,16 +930,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        return getMeasuredWidth() - getPaddingLeft() - getPaddingRight() - (mCountX * mCellWidth);

    }



    @Override

    protected void setChildrenDrawingCacheEnabled(boolean enabled) {

        mShortcutsAndWidgets.setChildrenDrawingCacheEnabled(enabled);

    }



    @Override

    protected void setChildrenDrawnWithCacheEnabled(boolean enabled) {

        mShortcutsAndWidgets.setChildrenDrawnWithCacheEnabled(enabled);

    }



    public float getBackgroundAlpha() {

        return mBackgroundAlpha;

    }

src/com/android/launcher3/ShortcutAndWidgetContainer.java

+0 −24
Original line number Diff line number Diff line
@@ -201,28 +201,4 @@ public class ShortcutAndWidgetContainer extends ViewGroup { 
            child.cancelLongPress();

        }

    }



    @Override

    protected void setChildrenDrawingCacheEnabled(boolean enabled) {

        final int count = getChildCount();

        for (int i = 0; i < count; i++) {

            final View view = getChildAt(i);

            view.setDrawingCacheEnabled(enabled);

            // Update the drawing caches

            if (!view.isHardwareAccelerated() && enabled) {

                view.buildDrawingCache(true);

            }

        }

    }



    protected void setChildrenDrawnWithCacheEnabled(boolean enabled) {

        super.setChildrenDrawnWithCacheEnabled(enabled);

    }



    @Override

    public void setLayerType(int layerType, Paint paint) {

        // When clip children is disabled do not use hardware layer,

        // as hardware layer forces clip children.

        super.setLayerType(getClipChildren() ? layerType : LAYER_TYPE_NONE, paint);

    }

}

src/com/android/launcher3/Workspace.java

+2 −51
Original line number Diff line number Diff line
@@ -500,7 +500,6 @@ public class Workspace extends PagedView 
        setWillNotDraw(false);

        setClipChildren(false);

        setClipToPadding(false);

        setChildrenDrawnWithCacheEnabled(true);



        setMinScale(mOverviewModeShrinkFactor);

        setupLayoutTransition();
@@ -1312,29 +1311,12 @@ public class Workspace extends PagedView 


    protected void onPageBeginMoving() {

        super.onPageBeginMoving();



        if (isHardwareAccelerated()) {

        updateChildrenLayersEnabled(false);

        } else {

            if (mNextPage != INVALID_PAGE) {

                // we're snapping to a particular screen

                enableChildrenCache(mCurrentPage, mNextPage);

            } else {

                // this is when user is actively dragging a particular screen, they might

                // swipe it either left or right (but we won't advance by more than one screen)

                enableChildrenCache(mCurrentPage - 1, mCurrentPage + 1);

            }

        }

    }



    protected void onPageEndMoving() {

        super.onPageEndMoving();



        if (isHardwareAccelerated()) {

        updateChildrenLayersEnabled(false);

        } else {

            clearChildrenCache();

        }



        if (mDragController.isDragging()) {

            if (workspaceInModalState()) {
@@ -1872,37 +1854,6 @@ public class Workspace extends PagedView 
        return mState != State.NORMAL;

    }



    void enableChildrenCache(int fromPage, int toPage) {

        if (fromPage > toPage) {

            final int temp = fromPage;

            fromPage = toPage;

            toPage = temp;

        }



        final int screenCount = getChildCount();



        fromPage = Math.max(fromPage, 0);

        toPage = Math.min(toPage, screenCount - 1);



        for (int i = fromPage; i <= toPage; i++) {

            final CellLayout layout = (CellLayout) getChildAt(i);

            layout.setChildrenDrawnWithCacheEnabled(true);

            layout.setChildrenDrawingCacheEnabled(true);

        }

    }



    void clearChildrenCache() {

        final int screenCount = getChildCount();

        for (int i = 0; i < screenCount; i++) {

            final CellLayout layout = (CellLayout) getChildAt(i);

            layout.setChildrenDrawnWithCacheEnabled(false);

            // In software mode, we don't want the items to continue to be drawn into bitmaps

            if (!isHardwareAccelerated()) {

                layout.setChildrenDrawingCacheEnabled(false);

            }

        }

    }



    @Thunk void updateChildrenLayersEnabled(boolean force) {

        boolean small = mState == State.OVERVIEW || mIsSwitchingState;

        boolean enableChildrenLayers = force || small || mAnimatingViewIntoPlace || isPageMoving();