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

am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev

Browse Source 
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
This commit is contained in:
Wale Ogunwale
2014-12-01 20:37:01 +00:00
committed by Android Git Automerger
parent 7158dfb1be e05fbd6901
commit ea64d0beea
10 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/DisplayInfo.java
View File

@@ -58,6 +58,11 @@ public final class DisplayInfo implements Parcelable {
*/
public String name;
/**
* Unique identifier for the display. Shouldn't be displayed to the user.
*/
public String uniqueId;
/**
* The width of the portion of the display that is available to applications, in pixels.
* Represents the size of the display minus any system decorations.
@@ -257,7 +262,7 @@ public final class DisplayInfo implements Parcelable {
&& flags == other.flags
&& type == other.type
&& Objects.equal(address, other.address)
&& Objects.equal(name, other.name)
&& Objects.equal(uniqueId, other.uniqueId)
&& appWidth == other.appWidth
&& appHeight == other.appHeight
&& smallestNominalAppWidth == other.smallestNominalAppWidth
@@ -293,6 +298,7 @@ public final class DisplayInfo implements Parcelable {
type = other.type;
address = other.address;
name = other.name;
uniqueId = other.uniqueId;
appWidth = other.appWidth;
appHeight = other.appHeight;
smallestNominalAppWidth = other.smallestNominalAppWidth;
@@ -348,6 +354,7 @@ public final class DisplayInfo implements Parcelable {
state = source.readInt();
ownerUid = source.readInt();
ownerPackageName = source.readString();
uniqueId = source.readString();
}
@Override
@@ -380,6 +387,7 @@ public final class DisplayInfo implements Parcelable {
dest.writeInt(state);
dest.writeInt(ownerUid);
dest.writeString(ownerPackageName);
dest.writeString(uniqueId);
}
@Override
@@ -445,6 +453,8 @@ public final class DisplayInfo implements Parcelable {
StringBuilder sb = new StringBuilder();
sb.append("DisplayInfo{\"");
sb.append(name);
sb.append("\", uniqueId \"");
sb.append(uniqueId);
sb.append("\", app ");
sb.append(appWidth);
sb.append(" x ");