From e75261d5a789397a5951b8f6e3b6cc8a24e4297c Mon Sep 17 00:00:00 2001
From: Administrator <981964879@qq.com>
Date: Thu, 26 Nov 2020 18:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9A=84=E7=BA=BF=E6=8D=A2?=
 =?UTF-8?q?=E6=88=90=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/layout/launcher.xml                              | 2 +-
 src/com/android/uiuios/Launcher.java                 | 9 ++++++++-
 src/com/android/uiuios/Workspace.java                | 4 +++-
 src/com/android/uiuios/states/SpringLoadedState.java | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

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 @@
 
         <!-- Keep these behind the workspace so that they are not visible when
          we go into AllApps -->
-        <com.android.uiuios.pageindicators.WorkspacePageIndicator
+        <com.android.uiuios.pageindicators.PageIndicatorDots
             android:id="@+id/page_indicator"
             android:layout_width="match_parent"
             android:layout_height="@dimen/vertical_drag_handle_size"
diff --git a/src/com/android/uiuios/Launcher.java b/src/com/android/uiuios/Launcher.java
index 1b782c1..9eb94be 100644
--- a/src/com/android/uiuios/Launcher.java
+++ b/src/com/android/uiuios/Launcher.java
@@ -109,6 +109,7 @@ import com.android.uiuios.logging.UserEventDispatcher.UserEventDelegate;
 import com.android.uiuios.model.AppLaunchTracker;
 import com.android.uiuios.model.ModelWriter;
 import com.android.uiuios.notification.NotificationListener;
+import com.android.uiuios.pageindicators.PageIndicatorDots;
 import com.android.uiuios.popup.PopupContainerWithArrow;
 import com.android.uiuios.popup.PopupDataProvider;
 import com.android.uiuios.shortcuts.DeepShortcutManager;
@@ -235,6 +236,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
 
     @Thunk Hotseat mHotseat;
 
+    private PageIndicatorDots mPageIndicatorDots;
+
     private DropTargetBar mDropTargetBar;
 
     // Main container view for the all apps screen.
@@ -1183,7 +1186,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         mWorkspace.initParentViews(mDragLayer);
         mOverviewPanel = findViewById(R.id.overview_panel);
         mHotseat = findViewById(R.id.hotseat);
-
+        mPageIndicatorDots=findViewById(R.id.page_indicator);
         mLauncherView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                 | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
@@ -1425,6 +1428,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
         return mHotseat;
     }
 
+    public PageIndicatorDots getIndicatorDots(){
+        return mPageIndicatorDots;
+    }
+
     public <T extends View> 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<WorkspacePageIndicator>
+//public class Workspace extends PagedView<WorkspacePageIndicator>
+public class Workspace extends PagedView<PageIndicatorDots>
         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(