diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-23 02:24:32 +0530 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-15 09:30:35 -0800 |
| commit | 6c46a6d324310bd2fc0ea223c9782ba6394512e7 (patch) | |
| tree | 242df2742a7f4f96bdcdf6474ea151e3616fe356 /src/com/android/launcher3/Workspace.java | |
| parent | fa94c79ca62cb1b7257d6ed4cc8684bb38a20a1f (diff) | |
| download | android_packages_apps_Trebuchet-6c46a6d324310bd2fc0ea223c9782ba6394512e7.tar.gz android_packages_apps_Trebuchet-6c46a6d324310bd2fc0ea223c9782ba6394512e7.tar.bz2 android_packages_apps_Trebuchet-6c46a6d324310bd2fc0ea223c9782ba6394512e7.zip | |
Using java_style enum generation for proto
This makes it easier to track various method parameters and simplifies
debug logging
Change-Id: Ib7c3d52590d0c36b2c8460c889ee3bead3454569
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 6520a2b6f..3cfb3e1eb 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -73,7 +73,7 @@ import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.shortcuts.DeepShortcutsContainer; -import com.android.launcher3.userevent.nano.LauncherLogProto; +import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.launcher3.userevent.nano.LauncherLogProto.Target; import com.android.launcher3.util.ItemInfoMatcher; import com.android.launcher3.util.LongArrayMap; @@ -188,11 +188,11 @@ public class Workspace extends PagedView // in all apps or customize mode) public enum State { - NORMAL (false, false, LauncherLogProto.WORKSPACE), - NORMAL_HIDDEN (false, false, LauncherLogProto.ALLAPPS), - SPRING_LOADED (false, true, LauncherLogProto.WORKSPACE), - OVERVIEW (true, true, LauncherLogProto.OVERVIEW), - OVERVIEW_HIDDEN (true, false, LauncherLogProto.WIDGETS); + NORMAL (false, false, ContainerType.WORKSPACE), + NORMAL_HIDDEN (false, false, ContainerType.ALLAPPS), + SPRING_LOADED (false, true, ContainerType.WORKSPACE), + OVERVIEW (true, true, ContainerType.OVERVIEW), + OVERVIEW_HIDDEN (true, false, ContainerType.WIDGETS); public final boolean shouldUpdateWidget; public final boolean hasMultipleVisiblePages; @@ -4155,12 +4155,12 @@ public class Workspace extends PagedView target.gridX = info.cellX; target.gridY = info.cellY; target.pageIndex = getCurrentPage(); - targetParent.containerType = LauncherLogProto.WORKSPACE; + targetParent.containerType = ContainerType.WORKSPACE; if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { target.rank = info.rank; - targetParent.containerType = LauncherLogProto.HOTSEAT; + targetParent.containerType = ContainerType.HOTSEAT; } else if (info.container >= 0) { - targetParent.containerType = LauncherLogProto.FOLDER; + targetParent.containerType = ContainerType.FOLDER; } } |