Fix CycleEditor

CycleEditor would return the wrong (last) value at the given keyframes.

Author: oscar-ad

desktop/CycleEditor/src/main/java/androidx/motionlayout/cycleEditor/CycleView.java

@@ -696,20 +696,22 @@ public void normalize() {
     }
 
     double getP(double time) {
+      if (time <= 0.0) {
+        return 0.0;
+      } else if (time >= 1) {
+        return 1.0;
+      }
       int index = Arrays.binarySearch(mPosition, time);
-      double p = 0;
-      if (index > 0) {
-        p = 1;
-      } else if (index != 0) {
+      if (index < 0) {
         index = -index - 1;
-        double t = time;
-        double m =
-            (mPeriod[index] - mPeriod[index - 1]) / (mPosition[index] - mPosition[index - 1]);
-        p = mArea[index - 1]
-            + (mPeriod[index - 1] - m * mPosition[index - 1]) * (t - mPosition[index - 1])
-            + m * (t * t - mPosition[index - 1] * mPosition[index - 1]) / 2;
       }
-      return p;
+
+      double t = time;
+      double m =
+              (mPeriod[index] - mPeriod[index - 1]) / (mPosition[index] - mPosition[index - 1]);
+      return mArea[index - 1]
+              + (mPeriod[index - 1] - m * mPosition[index - 1]) * (t - mPosition[index - 1])
+              + m * (t * t - mPosition[index - 1] * mPosition[index - 1]) / 2;
     }
 
     public double getValue(double time) {

desktop/CycleEditor/src/main/java/androidx/motionlayout/cycleEditor/Oscillator.java

@@ -58,19 +58,22 @@ public Oscillator() {
     }
 
     double getP(double time) {
+        if (time <= 0.0) {
+            return 0.0;
+        } else if (time >= 1) {
+            return 1.0;
+        }
         int index = Arrays.binarySearch(mPosition, time);
-        double p = 0;
-        if (index > 0) {
-            p = 1;
-        } else if (index != 0) {
+        if (index < 0) {
             index = -index - 1;
-            double t = time;
-            double m = (mPeriod[index] - mPeriod[index - 1]) / (mPosition[index] - mPosition[index - 1]);
-            p = mArea[index - 1]
-                    + (mPeriod[index - 1] - m * mPosition[index - 1]) * (t - mPosition[index - 1])
-                    + m * (t * t - mPosition[index - 1] * mPosition[index - 1]) / 2;
         }
-        return p;
+
+        double t = time;
+        double m =
+                (mPeriod[index] - mPeriod[index - 1]) / (mPosition[index] - mPosition[index - 1]);
+        return mArea[index - 1]
+                + (mPeriod[index - 1] - m * mPosition[index - 1]) * (t - mPosition[index - 1])
+                + m * (t * t - mPosition[index - 1] * mPosition[index - 1]) / 2;
     }
 
     public double getValue(double time) {