diff options
Diffstat (limited to 'src/com/android')
4 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java index 0902b2029..b7b75f87d 100644 --- a/src/com/android/launcher3/SettingsActivity.java +++ b/src/com/android/launcher3/SettingsActivity.java @@ -26,7 +26,6 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.provider.Settings; import android.provider.Settings.System; -import android.support.v4.os.BuildCompat; import com.android.launcher3.graphics.IconShapeOverride; @@ -85,7 +84,7 @@ public class SettingsActivity extends Activity { } Preference iconBadgingPref = findPreference(ICON_BADGING_PREFERENCE_KEY); - if (!BuildCompat.isAtLeastO()) { + if (!Utilities.isAtLeastO()) { getPreferenceScreen().removePreference( findPreference(SessionCommitReceiver.ADD_ICON_PREFERENCE_KEY)); getPreferenceScreen().removePreference(iconBadgingPref); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index c2987f881..9100fe28d 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -38,7 +38,6 @@ import android.os.Bundle; import android.os.DeadObjectException; import android.os.PowerManager; import android.os.TransactionTooLargeException; -import android.support.v4.os.BuildCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -86,7 +85,7 @@ public final class Utilities { private static final Matrix sInverseMatrix = new Matrix(); public static boolean isAtLeastO() { - return BuildCompat.isAtLeastO(); + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; } public static final boolean ATLEAST_NOUGAT_MR1 = diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java index 8dca699ef..2d9c23e2d 100644 --- a/src/com/android/launcher3/notification/NotificationListener.java +++ b/src/com/android/launcher3/notification/NotificationListener.java @@ -24,8 +24,8 @@ import android.os.Message; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.support.annotation.Nullable; -import android.support.v4.util.Pair; import android.text.TextUtils; +import android.util.Pair; import com.android.launcher3.LauncherModel; import com.android.launcher3.config.FeatureFlags; diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java index cea58b994..d87e7fb98 100644 --- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java +++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java @@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Rect; -import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.Gravity; @@ -29,6 +28,7 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.TextView; @@ -81,7 +81,8 @@ public class WidgetsBottomSheet extends AbstractFloatingView implements Insettab setWillNotDraw(false); mLauncher = Launcher.getLauncher(context); mOpenCloseAnimator = LauncherAnimUtils.ofPropertyValuesHolder(this); - mFastOutSlowInInterpolator = new FastOutSlowInInterpolator(); + mFastOutSlowInInterpolator = + AnimationUtils.loadInterpolator(context, android.R.interpolator.fast_out_slow_in); mScrollInterpolator = new VerticalPullDetector.ScrollInterpolator(); mInsets = new Rect(); mVerticalPullDetector = new VerticalPullDetector(context); |