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

Commit fbed86e6 authored by Nilesh Agrawal's avatar Nilesh Agrawal Committed by Android Git Automerger
Browse files

am 579c8433: Merge "Allow scrolling folders in when all apps is disabled." into jb-ub-now-kermit 

* commit '579c8433':
  Allow scrolling folders in when all apps is disabled.
parents eb870e15 579c8433

src/com/android/launcher3/CellLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public class CellLayout extends ViewGroup { 
        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CellLayout, defStyle, 0);



        mCellWidth = mCellHeight = -1;

        mFixedCellHeight = mFixedCellHeight = -1;

        mFixedCellWidth = mFixedCellHeight = -1;

        mWidthGap = mOriginalWidthGap = 0;

        mHeightGap = mOriginalHeightGap = 0;

        mMaxGap = Integer.MAX_VALUE;

src/com/android/launcher3/Folder.java

+14 −3
Original line number Diff line number Diff line
@@ -145,8 +145,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 


        Resources res = getResources();

        mMaxCountX = (int) grid.numColumns;

        // Allow scrolling folders when DISABLE_ALL_APPS is true.

        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {

            mMaxCountY = mMaxNumItems = Integer.MAX_VALUE;

        } else {

            mMaxCountY = (int) grid.numRows;

            mMaxNumItems = mMaxCountX * mMaxCountY;

        }



        mInputMethodManager = (InputMethodManager)

                getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -1009,7 +1014,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(),

                MeasureSpec.EXACTLY);



        if (AppsCustomizePagedView.DISABLE_ALL_APPS) {

            // Don't cap the height of the content to allow scrolling.

            mContent.setFixedSize(getContentAreaWidth(), mContent.getDesiredHeight());

        } else {

            mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight());

        }



        mScrollView.measure(contentAreaWidthSpec, contentAreaHeightSpec);

        mFolderName.measure(contentAreaWidthSpec,

                MeasureSpec.makeMeasureSpec(mFolderNameHeight, MeasureSpec.EXACTLY));