PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '579c8433f968fd8235527865797f8d58c20487da':
  Allow scrolling folders in when all apps is disabled.
This commit is contained in:
Nilesh Agrawal
2014-02-14 20:38:53 +00:00
committed by Android Git Automerger
parent eb870e154a 579c8433f9
commit fbed86e6da
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/CellLayout.java
+1 -1
View File
@@ -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
View File
@@ -145,8 +145,13 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
Resources res = getResources();
mMaxCountX = (int) grid.numColumns;
mMaxCountY = (int) grid.numRows;
mMaxNumItems = mMaxCountX * mMaxCountY;
// 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);
mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight());
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));