From 1e1fb32558f93f617584b3d3296a27e8ea0e3912 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Sat, 31 Oct 2020 15:54:02 -0400
Subject: [PATCH] Fix some version checks to use android.os.Build

---
 app/src/main/java/org/schabi/newpipe/util/Localization.java | 2 +-
 .../org/schabi/newpipe/views/ExpandableSurfaceView.java     | 6 +++---
 .../java/org/schabi/newpipe/views/FocusOverlayView.java     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 700d7b63d..96ba2808d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -186,7 +186,7 @@ public final class Localization {
     }
 
     public static String shortCount(final Context context, final long count) {
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return CompactDecimalFormat.getInstance(getAppLocale(context),
                     CompactDecimalFormat.CompactStyle.SHORT).format(count);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
index a23172bd3..e7a028d50 100644
--- a/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
@@ -1,8 +1,7 @@
 package org.schabi.newpipe.views;
 
 import android.content.Context;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.SurfaceView;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
@@ -47,7 +46,8 @@ public class ExpandableSurfaceView extends SurfaceView {
 
         if (resizeMode == RESIZE_MODE_FIT
                 // KitKat doesn't work well when a view has a scale like needed for ZOOM
-                || (resizeMode == RESIZE_MODE_ZOOM && VERSION.SDK_INT < VERSION_CODES.LOLLIPOP)) {
+                || (resizeMode == RESIZE_MODE_ZOOM
+                && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)) {
             if (aspectDeformation > 0) {
                 height = (int) (width / videoAspectRatio);
             } else {
diff --git a/app/src/main/java/org/schabi/newpipe/views/FocusOverlayView.java b/app/src/main/java/org/schabi/newpipe/views/FocusOverlayView.java
index dc5bf7133..29c38511c 100644
--- a/app/src/main/java/org/schabi/newpipe/views/FocusOverlayView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/FocusOverlayView.java
@@ -270,7 +270,7 @@ public final class FocusOverlayView extends Drawable implements
         clearFocusObstacles((ViewGroup) decor);
     }
 
-    @RequiresApi(api = 26)
+    @RequiresApi(api = Build.VERSION_CODES.O)
     private static void clearFocusObstacles(final ViewGroup viewGroup) {
         viewGroup.setTouchscreenBlocksFocus(false);