diff --git a/app/src/main/java/com/kamron/pogoiv/Pokefly.java b/app/src/main/java/com/kamron/pogoiv/Pokefly.java index 2f96dec29..d9dcc9629 100644 --- a/app/src/main/java/com/kamron/pogoiv/Pokefly.java +++ b/app/src/main/java/com/kamron/pogoiv/Pokefly.java @@ -335,18 +335,24 @@ public class Pokefly extends Service { private @NonNull Optional screenShotPath = Optional.absent(); + @SuppressWarnings("deprecation") private final WindowManager.LayoutParams arcParams = new WindowManager.LayoutParams( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.TYPE_PHONE, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + ? WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY + : WindowManager.LayoutParams.TYPE_PHONE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, PixelFormat.TRANSLUCENT); private int statusBarHeight = 0; + @SuppressWarnings("deprecation") private final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams( WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.TYPE_PHONE, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + ? WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY + : WindowManager.LayoutParams.TYPE_PHONE, WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN, PixelFormat.TRANSPARENT); diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java index 039ea03e6..96e52ab2a 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java @@ -4,6 +4,7 @@ import android.graphics.PixelFormat; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; +import android.os.Build; import android.support.v4.content.res.ResourcesCompat; import android.view.Gravity; import android.view.MotionEvent; @@ -27,10 +28,13 @@ public class IVPopupButton extends android.support.v7.widget.AppCompatButton { private WindowManager windowManager; private boolean showing = false; + @SuppressWarnings("deprecation") private final WindowManager.LayoutParams ivButtonParams = new WindowManager.LayoutParams( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT, - WindowManager.LayoutParams.TYPE_PHONE, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + ? WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY + : WindowManager.LayoutParams.TYPE_PHONE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSLUCENT); diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ScreenWatcher.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ScreenWatcher.java index ded9fa2ca..c78e7d541 100644 --- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ScreenWatcher.java +++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ScreenWatcher.java @@ -4,6 +4,7 @@ import android.graphics.Color; import android.graphics.PixelFormat; import android.graphics.Point; +import android.os.Build; import android.os.Handler; import android.support.annotation.ColorInt; import android.util.DisplayMetrics; @@ -105,10 +106,13 @@ public void watchScreen() { screenScanRunnable = new ScreenScan(); touchView = new LinearLayout(pokefly); + //noinspection deprecation touchViewParams = new WindowManager.LayoutParams( 1, 1, - WindowManager.LayoutParams.TYPE_PHONE, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + ? WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY + : WindowManager.LayoutParams.TYPE_PHONE, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH,