Commit 605189bc authored by vvb2060's avatar vvb2060 Committed by John Wu

Hide overlay windows

parent c0a2e367
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
<uses-permission <uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" android:maxSdkVersion="29"
......
...@@ -89,6 +89,10 @@ class SettingsViewModel( ...@@ -89,6 +89,10 @@ class SettingsViewModel(
// Re-authenticate is not feasible on 8.0+ // Re-authenticate is not feasible on 8.0+
list.add(Reauthenticate) list.add(Reauthenticate)
} }
if (Build.VERSION.SDK_INT >= 31) {
// Can hide overlay windows on 12.0+
list.remove(Tapjack)
}
} }
return list return list
......
...@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.surequest ...@@ -3,6 +3,7 @@ package com.topjohnwu.magisk.ui.surequest
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.content.res.Resources import android.content.res.Resources
import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.Window import android.view.Window
import android.view.WindowManager import android.view.WindowManager
...@@ -29,6 +30,9 @@ open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityReques ...@@ -29,6 +30,9 @@ open class SuRequestActivity : BaseUIActivity<SuRequestViewModel, ActivityReques
lockOrientation() lockOrientation()
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
window.addFlags(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) window.addFlags(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
window.setHideOverlayWindows(true)
}
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
fun showRequest() { fun showRequest() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment