Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: get default display via displaymanager #585

Merged
merged 2 commits into from
Dec 28, 2023
Merged

feat: get default display via displaymanager #585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b9164f
feat: get default display via displaymanager
KazuCocoa Dec 27, 2023
6fb6b38
calls androidx.test.platform.app.InstrumentationRegistry.getInstrumen…
KazuCocoa Dec 27, 2023
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
14 changes: 14 additions & 0 deletions app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
*/
package io.appium.uiautomator2.core;

import android.app.Service;
import android.app.UiAutomation;
import android.hardware.display.DisplayManager;
import android.os.Build;
import android.view.Display;
import android.view.accessibility.AccessibilityNodeInfo;

Expand All @@ -27,6 +30,8 @@
import static io.appium.uiautomator2.utils.ReflectionUtils.getMethod;
import static io.appium.uiautomator2.utils.ReflectionUtils.invoke;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

public class UiAutomatorBridge {
private static UiAutomatorBridge INSTANCE = null;

Expand Down Expand Up @@ -54,6 +59,15 @@ public UiAutomation getUiAutomation() {
}

public Display getDefaultDisplay() throws UiAutomator2Exception {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
// Device.getUiDevice gets the instance via 'androidx.test.platform.app.InstrumentationRegistry.getInstrumentation'
// context, thus here directly calls the method.
DisplayManager displayManager = (DisplayManager) getInstrumentation().getContext().getSystemService(Service.DISPLAY_SERVICE);
return displayManager.getDisplay(Display.DEFAULT_DISPLAY);
}

// "getDefaultDisplay" called inside the UiDevice calls
// https://developer.android.com/reference/android/view/WindowManager#getDefaultDisplay()
return (Display) invoke(getMethod(UiDevice.class, "getDefaultDisplay"), Device.getUiDevice());
}
}
Loading