Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

Fix crash when targeting Android Oreo (API 26) #792

Merged
nahojjjen merged 1 commit into from
Oct 16, 2017
Merged

Fix crash when targeting Android Oreo (API 26) #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/src/main/java/com/kamron/pogoiv/Pokefly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,18 +335,24 @@ public class Pokefly extends Service {
private @NonNull Optional<String> 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);

Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/kamron/pogoiv/pokeflycomponents/IVPopupButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/kamron/pogoiv/pokeflycomponents/ScreenWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down