diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml index cb87377..767c129 100644 --- a/res/layout/launcher.xml +++ b/res/layout/launcher.xml @@ -50,7 +50,7 @@ - T getOverviewPanel() { return (T) mOverviewPanel; } diff --git a/src/com/android/uiuios/Workspace.java b/src/com/android/uiuios/Workspace.java index 5d82d5c..e84a2ed 100644 --- a/src/com/android/uiuios/Workspace.java +++ b/src/com/android/uiuios/Workspace.java @@ -81,6 +81,7 @@ import com.android.uiuios.folder.PreviewBackground; import com.android.uiuios.graphics.DragPreviewProvider; import com.android.uiuios.graphics.PreloadIconDrawable; import com.android.uiuios.graphics.RotationMode; +import com.android.uiuios.pageindicators.PageIndicatorDots; import com.android.uiuios.pageindicators.WorkspacePageIndicator; import com.android.uiuios.popup.PopupContainerWithArrow; import com.android.uiuios.shortcuts.ShortcutDragPreviewProvider; @@ -110,7 +111,8 @@ import java.util.function.Predicate; * Each page contains a number of icons, folders or widgets the user can * interact with. A workspace is meant to be used with a fixed width only. */ -public class Workspace extends PagedView +//public class Workspace extends PagedView +public class Workspace extends PagedView implements DropTarget, DragSource, View.OnTouchListener, DragController.DragListener, Insettable, LauncherStateManager.StateHandler, WorkspaceLayoutManager { diff --git a/src/com/android/uiuios/states/SpringLoadedState.java b/src/com/android/uiuios/states/SpringLoadedState.java index 8e63dff..ffaa92f 100644 --- a/src/com/android/uiuios/states/SpringLoadedState.java +++ b/src/com/android/uiuios/states/SpringLoadedState.java @@ -81,7 +81,7 @@ public class SpringLoadedState extends LauncherState { public void onStateEnabled(Launcher launcher) { Workspace ws = launcher.getWorkspace(); ws.showPageIndicatorAtCurrentScroll(); - ws.getPageIndicator().setShouldAutoHide(false); +// ws.getPageIndicator().setShouldAutoHide(false); // Prevent any Un/InstallShortcutReceivers from updating the db while we are // in spring loaded mode @@ -96,7 +96,7 @@ public class SpringLoadedState extends LauncherState { @Override public void onStateDisabled(final Launcher launcher) { - launcher.getWorkspace().getPageIndicator().setShouldAutoHide(true); +// launcher.getWorkspace().getPageIndicator().setShouldAutoHide(true); // Re-enable any Un/InstallShortcutReceiver and now process any queued items InstallShortcutReceiver.disableAndFlushInstallQueue(