diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java index 5654b68..600d65a 100644 --- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java +++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java @@ -91,7 +91,7 @@ public class LightningDialogBuilder { .subscribe(new SingleOnSubscribe() { @Override public void onItem(@Nullable HistoryItem historyItem) { - // TODO: 6/14/17 figure out solution to case where slashes get appended to root urls causing the item to be null + // TODO: 6/14/17 figure out solution to case where slashes get appended to root urls causing the item to be null if (historyItem != null) { showLongPressedDialogForBookmarkUrl(activity, uiController, historyItem); } diff --git a/app/src/main/java/acr/browser/lightning/interpolator/BezierDecelerateInterpolator.java b/app/src/main/java/acr/browser/lightning/interpolator/BezierDecelerateInterpolator.java index 5ee0a3e..9756f8b 100644 --- a/app/src/main/java/acr/browser/lightning/interpolator/BezierDecelerateInterpolator.java +++ b/app/src/main/java/acr/browser/lightning/interpolator/BezierDecelerateInterpolator.java @@ -1,10 +1,8 @@ package acr.browser.lightning.interpolator; -import android.os.Build; import android.support.annotation.NonNull; -import android.view.animation.DecelerateInterpolator; +import android.support.v4.view.animation.PathInterpolatorCompat; import android.view.animation.Interpolator; -import android.view.animation.PathInterpolator; /** * Bezier decelerate curve similar to iOS. @@ -17,11 +15,7 @@ public class BezierDecelerateInterpolator implements Interpolator { private static final Interpolator PATH_INTERPOLATOR; static { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - PATH_INTERPOLATOR = new PathInterpolator(0.25f, 0.1f, 0.25f, 1); - } else { - PATH_INTERPOLATOR = new DecelerateInterpolator(); - } + PATH_INTERPOLATOR = PathInterpolatorCompat.create(0.25f, 0.1f, 0.25f, 1); } @Override