summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/DisplayInfo.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-05-18 21:30:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-18 21:30:22 +0000
commit98465f99bb9aa2da3905241a0ca95b708100560b (patch)
treec4e47849c5fe8cf60a90c44bb7d2ade2dca1cdb5 /core/java/android/view/DisplayInfo.java
parent863e65e123e19254901871426caf39f1145ce3bd (diff)
parent49e7ff9647e6547c2b852944a5435a05794b9951 (diff)
downloadframeworks_base-98465f99bb9aa2da3905241a0ca95b708100560b.zip
frameworks_base-98465f99bb9aa2da3905241a0ca95b708100560b.tar.gz
frameworks_base-98465f99bb9aa2da3905241a0ca95b708100560b.tar.bz2
Merge "Add Configuration data for round displays" into mnc-dev
Diffstat (limited to 'core/java/android/view/DisplayInfo.java')
-rw-r--r--core/java/android/view/DisplayInfo.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index b9fde8a..cf17990 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -609,6 +609,9 @@ public final class DisplayInfo implements Parcelable {
if ((flags & Display.FLAG_SCALING_DISABLED) != 0) {
result.append(", FLAG_SCALING_DISABLED");
}
+ if ((flags & Display.FLAG_ROUND) != 0) {
+ result.append(", FLAG_ROUND");
+ }
return result.toString();
}
}