diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-07-23 00:01:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-23 00:01:22 +0000 |
| commit | 6c047fc67aa72b10e1980805e72f13d98ea4633b (patch) | |
| tree | 80cba9b2b32d71d8cb4eaafe1efac88a2fe5a722 | |
| parent | e117e225b96454d8c44544e212b33b0553c476b6 (diff) | |
| parent | 737860c7b1dee78cc6c22e8c655283aa1cd1a100 (diff) | |
| download | base-6c047fc67aa72b10e1980805e72f13d98ea4633b.tar.gz | |
Merge "Add new density constant - 360dpi" into studio-1.3-release
| -rw-r--r-- | layoutlib-api/src/main/java/com/android/resources/Density.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/layoutlib-api/src/main/java/com/android/resources/Density.java b/layoutlib-api/src/main/java/com/android/resources/Density.java index 4f569093a0..15c81f5cc3 100644 --- a/layoutlib-api/src/main/java/com/android/resources/Density.java +++ b/layoutlib-api/src/main/java/com/android/resources/Density.java @@ -27,6 +27,7 @@ public enum Density implements ResourceEnum { DPI_560("560dpi", "560 DPI Density", 560, 1), //$NON-NLS-1$ XXHIGH( "xxhdpi", "XX-High Density", 480, 16), //$NON-NLS-1$ DPI_400("400dpi", "400 DPI Density", 400, 1), //$NON-NLS-1$ + DPI_360("360dpi", "360 DPI Density", 360, 23), //$NON-NLS-1$ XHIGH( "xhdpi", "X-High Density", 320, 8), //$NON-NLS-1$ DPI_280("280dpi", "280 DPI Density", 280, 22), //$NON-NLS-1$ HIGH( "hdpi", "High Density", 240, 4), //$NON-NLS-1$ @@ -140,6 +141,7 @@ public enum Density implements ResourceEnum { switch (this) { case TV: case DPI_280: + case DPI_360: case DPI_400: case DPI_560: return false; |