Refactoring folder content

> Refactoring the CellLayout in folder with a custom view so
that it can be replaced easily with a scrollable paged view.
> Moving some methods from the folder to this new view which
assume a single page layout for the folder
> Changing folder from LinearLayout to FrameLayout to properly
handle focus traversal in case of multi-page folders

Change-Id: I073c00b995488f9f5d8123b00357e094ca2cec7c
This commit is contained in:
Sunny Goyal
2015-03-04 15:55:47 -08:00
parent 8dbf0fff1f
commit c3a609f950
5 changed files with 441 additions and 422 deletions
+1 -3
View File
@@ -22,7 +22,6 @@ import android.view.KeyEvent;
import android.view.SoundEffectConstants;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ScrollView;
import com.android.launcher3.util.FocusLogic;
@@ -354,8 +353,7 @@ public class FocusHelper {
// Initialize the variables.
ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent();
final CellLayout layout = (CellLayout) parent.getParent();
final ScrollView scrollView = (ScrollView) layout.getParent();
final Folder folder = (Folder) scrollView.getParent();
final Folder folder = (Folder) layout.getParent().getParent();
View title = folder.mFolderName;
Workspace workspace = (Workspace) v.getRootView().findViewById(R.id.workspace);
final int countX = layout.getCountX();