diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-21 05:14:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-21 05:14:55 -0700 |
| commit | 08c93d7eca03ec2cd1300ce6a085b59a4670a03b (patch) | |
| tree | ac9eeed6817ad2b1b1abd4afb1c07b2f3a767e6f /src/com/android/launcher2/Folder.java | |
| parent | cf4b91fa3f4d2c6b4bce5f6cf177979ea9ca7aad (diff) | |
| parent | a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4 (diff) | |
| download | android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.tar.gz android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.tar.bz2 android_packages_apps_Trebuchet-08c93d7eca03ec2cd1300ce6a085b59a4670a03b.zip | |
Merge "Eliminate custom alpha handling in CellLayout"
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 3e8c4a3e7..6856a09eb 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -148,7 +148,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList super.onFinishInflate(); mContent = (CellLayout) findViewById(R.id.folder_content); mContent.setGridSize(0, 0); - mContent.getChildrenLayout().setMotionEventSplittingEnabled(false); + mContent.getShortcutsAndWidgets().setMotionEventSplittingEnabled(false); mFolderName = (FolderEditText) findViewById(R.id.folder_name); mFolderName.setFolder(this); mFolderName.setOnFocusChangeListener(this); @@ -735,7 +735,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mLauncher.getWorkspace().setFinalScrollForPageChange(currentPage); // We first fetch the currently visible CellLayoutChildren CellLayout currentLayout = (CellLayout) mLauncher.getWorkspace().getChildAt(currentPage); - CellLayoutChildren boundingLayout = currentLayout.getChildrenLayout(); + ShortcutAndWidgetContainer boundingLayout = currentLayout.getShortcutsAndWidgets(); Rect bounds = new Rect(); parent.getDescendantRectRelativeToSelf(boundingLayout, bounds); // We reset the workspaces scroll @@ -826,11 +826,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } public int getItemCount() { - return mContent.getChildrenLayout().getChildCount(); + return mContent.getShortcutsAndWidgets().getChildCount(); } public View getItemAt(int index) { - return mContent.getChildrenLayout().getChildAt(index); + return mContent.getShortcutsAndWidgets().getChildAt(index); } private void onCloseComplete() { |