summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-02-12 17:26:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 17:26:41 +0000
commit18b66aea059ce8db599fabd4b9db809f2dfdc19c (patch)
tree9dd59d3094b5e7555427ba68a4e041b61165e587 /api
parent1b8f719460b52debfe326f2d712bf1f927660d19 (diff)
parent05ba1a92809ef17ef30297bdd67f2d4fb33670af (diff)
downloadprebuilts_sdk-18b66aea059ce8db599fabd4b9db809f2dfdc19c.zip
prebuilts_sdk-18b66aea059ce8db599fabd4b9db809f2dfdc19c.tar.gz
prebuilts_sdk-18b66aea059ce8db599fabd4b9db809f2dfdc19c.tar.bz2
am 05ba1a92: am a16b158a: am 5a50c4a9: am a2cff538: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '05ba1a92809ef17ef30297bdd67f2d4fb33670af': Add DENSITY_280
Diffstat (limited to 'api')
-rw-r--r--api/22.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/22.txt b/api/22.txt
index 3e11cda..144f292 100644
--- a/api/22.txt
+++ b/api/22.txt
@@ -31435,6 +31435,7 @@ package android.util {
method public boolean equals(android.util.DisplayMetrics);
method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults();
+ field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0