Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a

Browse Source 
Change-Id: Ie0fb340288decd887a9e47f7626c43c0ad2290e2
This commit is contained in:
TreeHugger Robot
2020-04-07 16:50:30 +00:00
committed by Automerger Merge Worker
parent 6085e49a5a bd745f763a
commit 8122a3938e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/test-current.txt
View File

@@ -4814,7 +4814,14 @@ package android.view {
public final class Display { public final class Display {
method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut(); method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut();
method public int getType();
method public boolean hasAccess(int); method public boolean hasAccess(int);
field public static final int TYPE_EXTERNAL = 2; // 0x2
field public static final int TYPE_INTERNAL = 1; // 0x1
field public static final int TYPE_OVERLAY = 4; // 0x4
field public static final int TYPE_UNKNOWN = 0; // 0x0
field public static final int TYPE_VIRTUAL = 5; // 0x5
field public static final int TYPE_WIFI = 3; // 0x3
} }
public class FocusFinder { public class FocusFinder {

7
core/java/android/view/Display.java
View File

@@ -253,12 +253,14 @@ public final class Display {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public static final int TYPE_UNKNOWN = 0; public static final int TYPE_UNKNOWN = 0;
/** /**
* Display type: Physical display connected through an internal port. * Display type: Physical display connected through an internal port.
* @hide * @hide
*/ */
@TestApi
public static final int TYPE_INTERNAL = 1; public static final int TYPE_INTERNAL = 1;
/** /**
@@ -266,6 +268,7 @@ public final class Display {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public static final int TYPE_EXTERNAL = 2; public static final int TYPE_EXTERNAL = 2;
/** /**
@@ -273,12 +276,14 @@ public final class Display {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public static final int TYPE_WIFI = 3; public static final int TYPE_WIFI = 3;
/** /**
* Display type: Overlay display. * Display type: Overlay display.
* @hide * @hide
*/ */
@TestApi
public static final int TYPE_OVERLAY = 4; public static final int TYPE_OVERLAY = 4;
/** /**
@@ -286,6 +291,7 @@ public final class Display {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public static final int TYPE_VIRTUAL = 5; public static final int TYPE_VIRTUAL = 5;
/** /**
@@ -569,6 +575,7 @@ public final class Display {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@TestApi
public int getType() { public int getType() {
return mType; return mType;
} }