diff options
author | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2015-12-23 17:21:24 -0800 |
---|---|---|
committer | Artem Shvadskiy <ashvadskiy@cyngn.com> | 2016-01-04 17:46:57 -0800 |
commit | 1a75f660937c99d39110c3f1335ae3bea1a85914 (patch) | |
tree | a59d306f5ac0f37b930b286957646288ccf201b2 /src/com/android/launcher3/Launcher.java | |
parent | b7121babd1abedc085244a5145052ad453ce86a6 (diff) | |
download | android_packages_apps_Trebuchet-1a75f660937c99d39110c3f1335ae3bea1a85914.tar.gz android_packages_apps_Trebuchet-1a75f660937c99d39110c3f1335ae3bea1a85914.tar.bz2 android_packages_apps_Trebuchet-1a75f660937c99d39110c3f1335ae3bea1a85914.zip |
Implement RemoteFolder metrics.
Additional changes:
1. Refactor drawer code to move xml and implementation out of trebuchet.
2. Move RemoteFolderUpdater to overlay, no stub class needed.
3. Pull TrackingEvent.Category out into EventCategory, and create overlay.
4. Remove old sync code from Folder.
5. Prevent RemoteFolder from inserting shortcuts into the database. All
remote items will exist in memory only.
6. Move RemoteFolder into overlay, and have manager create an instance
for FolderIcon.
7. Move folder sync out of LauncherModel.
Patch 2: Re-add shortcut click handling in Folder and move EventCategory
back into TrackingEvent.Category.
Patch 3: Remove whitespace/javadoc/import changes.
Change-Id: Ifc648f231bf6f6f35d8be45f8885f741b7539487
issue-id: CYNGNOS-1330
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ff59dce08..7fc373061 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2984,14 +2984,6 @@ public class Launcher extends Activity onClickAllAppsButton(v); } else if (tag instanceof AppInfo) { AppInfo info = (AppInfo) tag; - - // Remote apps do not exist in package manager, so they should be launched - // directly by intent. - if (info.isRemote()) { - startActivity(info.intent); - return; - } - startAppShortcutOrInfoActivity(v); LauncherApplication.getLauncherStats().sendAppLaunchEvent( LauncherStats.ORIGIN_APPDRAWER, info.componentName.getPackageName()); @@ -3242,10 +3234,6 @@ public class Launcher extends Activity closeFolder(); // Open the requested folder openFolder(folderIcon, folderTouchXYOffset); - - if (info.isRemote()) { - mModel.syncRemoteFolder(info, this); - } } else { // Find the open folder... int folderScreen; @@ -4882,6 +4870,7 @@ public class Launcher extends Activity addedApps != null && mAppsCustomizeContent != null) { mAppsCustomizeContent.addApps(addedApps); mAppDrawerAdapter.addApps(addedApps); + mRemoteFolderManager.onBindAddApps(addedApps); } } @@ -4962,10 +4951,6 @@ public class Launcher extends Activity newFolder.setTextVisible(!mHideIconLabels); workspace.addInScreenFromBind(newFolder, item.container, item.screenId, item.cellX, item.cellY, 1, 1); - - if (((FolderInfo) item).isRemote()) { - mRemoteFolderManager.setRemoteFolder(newFolder); - } break; default: throw new RuntimeException("Invalid Item Type"); |