mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 06:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using AndroidVersions.API_31_ANDROID_12 to distinguish between shouldShowIme and getDisplayImePolicy

Browse source
This commit is contained in:
chengjian.scj 2024-12-27 16:14:57 +08:00
commit 569b1bb418
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
View file

@ -4,6 +4,7 @@ import com.genymobile.scrcpy.AndroidVersions;
import com.genymobile.scrcpy.util.Ln; import com.genymobile.scrcpy.util.Ln;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.os.Build;
import android.os.IInterface; import android.os.IInterface;
import android.view.IDisplayWindowListener; import android.view.IDisplayWindowListener;
@ -28,11 +29,8 @@ public final class WindowManager {
private int thawDisplayRotationMethodVersion; private int thawDisplayRotationMethodVersion;
private Method getDisplayImePolicyMethod; private Method getDisplayImePolicyMethod;
private boolean getDisplayImePolicyMethodNewVersion = true;
private Method setDisplayImePolicyMethod; private Method setDisplayImePolicyMethod;
private boolean setDisplayImePolicyMethodNewVersion = true;
static WindowManager create() { static WindowManager create() {
IInterface manager = ServiceManager.getService("window", "android.view.IWindowManager"); IInterface manager = ServiceManager.getService("window", "android.view.IWindowManager");
@ -214,11 +212,10 @@ public final class WindowManager {
@TargetApi(AndroidVersions.API_29_ANDROID_10) @TargetApi(AndroidVersions.API_29_ANDROID_10)
private Method getGetDisplayImePolicyMethod() throws NoSuchMethodException { private Method getGetDisplayImePolicyMethod() throws NoSuchMethodException {
if (getDisplayImePolicyMethod == null) { if (getDisplayImePolicyMethod == null) {
try { if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
getDisplayImePolicyMethod = manager.getClass().getMethod("getDisplayImePolicy", int.class); getDisplayImePolicyMethod = manager.getClass().getMethod("getDisplayImePolicy", int.class);
} catch (NoSuchMethodException e) { } else {
getDisplayImePolicyMethod = manager.getClass().getMethod("shouldShowIme", int.class); getDisplayImePolicyMethod = manager.getClass().getMethod("shouldShowIme", int.class);
getDisplayImePolicyMethodNewVersion = false;
} }
} }
return getDisplayImePolicyMethod; return getDisplayImePolicyMethod;
@ -228,26 +225,25 @@ public final class WindowManager {
public int getDisplayImePolicy(int displayId) { public int getDisplayImePolicy(int displayId) {
try { try {
Method method = getGetDisplayImePolicyMethod(); Method method = getGetDisplayImePolicyMethod();
if (getDisplayImePolicyMethodNewVersion) { if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
return (int) method.invoke(manager, displayId); return (int) method.invoke(manager, displayId);
} else { } else {
boolean shouldShow = (boolean) method.invoke(manager, displayId); boolean shouldShow = (boolean) method.invoke(manager, displayId);
return shouldShow ? DISPLAY_IME_POLICY_LOCAL : DISPLAY_IME_POLICY_FALLBACK_DISPLAY; return shouldShow ? DISPLAY_IME_POLICY_LOCAL : DISPLAY_IME_POLICY_FALLBACK_DISPLAY;
} }
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
Ln.e("Could not invoke method", e); Ln.e("Could not invoke method", e);
return DISPLAY_IME_POLICY_FALLBACK_DISPLAY; return -1;
} }
} }
@TargetApi(AndroidVersions.API_29_ANDROID_10) @TargetApi(AndroidVersions.API_29_ANDROID_10)
private Method getSetDisplayImePolicyMethod() throws NoSuchMethodException { private Method getSetDisplayImePolicyMethod() throws NoSuchMethodException {
if (setDisplayImePolicyMethod == null) { if (setDisplayImePolicyMethod == null) {
try { if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
setDisplayImePolicyMethod = manager.getClass().getMethod("setDisplayImePolicy", int.class, int.class); setDisplayImePolicyMethod = manager.getClass().getMethod("setDisplayImePolicy", int.class, int.class);
} catch (NoSuchMethodException e) { } else {
setDisplayImePolicyMethod = manager.getClass().getMethod("setShouldShowIme", int.class, boolean.class); setDisplayImePolicyMethod = manager.getClass().getMethod("setShouldShowIme", int.class, boolean.class);
setDisplayImePolicyMethodNewVersion = false;
} }
} }
return setDisplayImePolicyMethod; return setDisplayImePolicyMethod;
@ -257,13 +253,13 @@ public final class WindowManager {
public void setDisplayImePolicy(int displayId, int imePolicy) { public void setDisplayImePolicy(int displayId, int imePolicy) {
try { try {
Method method = getSetDisplayImePolicyMethod(); Method method = getSetDisplayImePolicyMethod();
if (setDisplayImePolicyMethodNewVersion) { if (Build.VERSION.SDK_INT >= AndroidVersions.API_31_ANDROID_12) {
method.invoke(manager, displayId, imePolicy); method.invoke(manager, displayId, imePolicy);
} else { } else {
if (imePolicy != DISPLAY_IME_POLICY_HIDE) { if (imePolicy != DISPLAY_IME_POLICY_HIDE) {
method.invoke(manager, displayId, imePolicy == DISPLAY_IME_POLICY_LOCAL); method.invoke(manager, displayId, imePolicy == DISPLAY_IME_POLICY_LOCAL);
} else { } else {
Ln.w("DISPLAY_IME_POLICY_HIDE not supported on this device"); Ln.w("DISPLAY_IME_POLICY_HIDE is not supported on this device");
} }
} }
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {