修改报错的问题

Launcher3-dev · May 16, 2018 · a2116a0 · a2116a0
1 parent 76f92af
commit a2116a0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/Launcher3_mx.iml b/Launcher3_mx.iml
@@ -41,6 +41,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/aospDebug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/aospDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/aospDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/proto/aospDebugAndroidTest/javanano" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/aosp/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/aosp/debug" isTestSource="true" generated="true" />
@@ -49,13 +56,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/aosp/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/aosp/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/aosp/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testAospDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/aosp/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/aosp/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/aosp/assets" type="java-resource" />

diff --git a/src/com/android/launcher3/mximpl/ScrollControllerImpl.java b/src/com/android/launcher3/mximpl/ScrollControllerImpl.java
@@ -1,16 +1,19 @@
 package com.android.launcher3.mximpl;
 
-import com.android.launcher3.allapps.SearchUiManager;
-import com.android.launcher3.touch.SwipeDetector;
-import com.android.launcher3.util.TouchController;
-
 /**
+ * 二级界面和菜单的控制接口
+ *
  * Created by yuchuan on 2018/4/14.
  */
 
-public interface ScrollControllerImpl extends TouchController, SwipeDetector.Listener,
-        SearchUiManager.OnScrollRangeChangeListener{
+public interface ScrollControllerImpl {
+
+    void updateCaret(float containerProgress, float velocity, boolean dragging);
+
+    void animateCaretToProgress(float progress);
+
+    float getThreshold();
 
-    boolean isTransitioning();
+    void onDragStart();
 
-}
+}