diff options
author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2015-12-09 10:46:16 -0800 |
---|---|---|
committer | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2015-12-09 16:10:41 -0800 |
commit | 57f0a5ecd4afd88659a36fdb698942b0c0cfda9e (patch) | |
tree | a76a6e10849fe730e5a38b3d9cf119916a394787 /src/com/android/launcher3/Folder.java | |
parent | d69f636f145d8ff2b49348d179cfa0bbb8d4f83b (diff) | |
download | android_packages_apps_Trebuchet-57f0a5ecd4afd88659a36fdb698942b0c0cfda9e.tar.gz android_packages_apps_Trebuchet-57f0a5ecd4afd88659a36fdb698942b0c0cfda9e.tar.bz2 android_packages_apps_Trebuchet-57f0a5ecd4afd88659a36fdb698942b0c0cfda9e.zip |
Add remote folder if it is not already present after OOBE, and enable toggle
in settings to hide remote folder if unwanted.
Refactor RemoteFolderUpdater to hold static instance of itself.
Refactor FolderInfo to use method for determining remote folder status, instead
of manually comparing subType flag.
Switch back from temp-coordinates after workspace drag/drop is completed.
Remove disable button from remote folder UI.
Patch 2: Pull remote folder code out of Launcher and into RemoteFolderManager.
Patch 3: Remote @author from RemoteFolderManager
Patch 4:
1. Remove delete button from folder.
2. Fix NPE when screens are full. Create a new screen and ad at (0,0).
3. Set default preference to false.
4. Clean up leftover imports and unnecessary conditionals.
5. Refactor Launcher.addFolder() method signature.
Patch 5: Add missing parenthesis.
Change-Id: I36b7a53175a568c5ebdc908d0256d9128e1bee65
issue-id: CYNGNOS-1378
issue-id: CYNGNOS-1331
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 4cc328c5a..a0bb2dc93 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -486,9 +486,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mInfo = info; final ArrayList<ShortcutInfo> children = info.contents; - if (info.subType == FolderInfo.REMOTE_SUBTYPE && children.isEmpty()) { + if (info.isRemote() && children.isEmpty()) { final int count = 6; - RemoteFolderUpdater updater = mLauncher.getRemoteFolderUpdaterInstance(); + RemoteFolderUpdater updater = RemoteFolderUpdater.getInstance(); updater.requestSync(getContext(), count, new RemoteFolderUpdater.RemoteFolderUpdateListener() { @Override public void onSuccess(List<RemoteFolderUpdater.RemoteFolderInfo> remoteFolderInfoList) { @@ -699,7 +699,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList circX, circY, 0, mScreenWidth); final View[] alphaViewSet; - if (mInfo.subType == FolderInfo.REMOTE_SUBTYPE) { + if (mInfo.isRemote()) { alphaViewSet = new View[] { mContent, mFolderName }; } else { alphaViewSet = new View[] { mFolderNameLockContainer, @@ -1517,7 +1517,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } private void replaceFolderWithFinalItem() { - if (mInfo.subType == FolderInfo.REMOTE_SUBTYPE) { + if (mInfo.isRemote()) { return; } @@ -1681,8 +1681,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mLauncher, item, mInfo.id, 0, item.cellX, item.cellY); // If this is a Remote Folder, we need to register each view with our updater for click handling. - if (mInfo.subType == FolderInfo.REMOTE_SUBTYPE) { - RemoteFolderUpdater updater = mLauncher.getModel().getRemoteFolderUpdaterInstance(); + if (mInfo.isRemote()) { + RemoteFolderUpdater updater = RemoteFolderUpdater.getInstance(); updater.registerViewForInteraction(getViewForInfo(item), item.getIntent()); } |