diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-03-20 03:18:20 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-03-20 11:13:05 -0700 |
| commit | a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4 (patch) | |
| tree | 265d71c942c1f99cb8bbc46f31eae23b4b1db231 /src/com/android/launcher2/Folder.java | |
| parent | 47a876d443ddc65c8d9a0c95da58d892dbb1faea (diff) | |
| download | android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.gz android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.bz2 android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.zip | |
Eliminate custom alpha handling in CellLayout
Also rename CellLayoutChildren to ShortcutsAndWidgetsView
Change-Id: Ic2ebc5497adb153cc2fce99730cc2c6fbdc101e6
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 07e76c9ef..4621c85a6 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); @@ -731,7 +731,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 @@ -822,11 +822,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() { |