diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-07-29 00:10:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-29 00:10:02 +0000 |
| commit | 65d2d1a4b0b7eb9f31555f3b2eae447f21e820b0 (patch) | |
| tree | e42181ec2d2044de5093bd2fe638cbc0eedaa8af | |
| parent | acfb1fcdaebf6b12840075ad4c4293fd157d5832 (diff) | |
| parent | fd857498d056a31f5e14bc4af38c09877ff57e75 (diff) | |
| download | platform_tools_base-idea133-milestone.tar.gz platform_tools_base-idea133-milestone.tar.bz2 platform_tools_base-idea133-milestone.zip | |
Merge "More layoutlib api changes." into idea133-milestoneidea133-milestone
| -rw-r--r-- | layoutlib-api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java | 8 | ||||
| -rw-r--r-- | layoutlib-api/src/main/java/com/android/resources/Density.java | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java index a8e1ffd571..2e1dfd6dc0 100644 --- a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java +++ b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/HardwareConfig.java @@ -101,4 +101,12 @@ public class HardwareConfig { public ScreenRound getScreenRoundness() { return mScreenRound; } + + /** + * @since 15 + */ + @SuppressWarnings({"MethodMayBeStatic", "unused"}) + public int getDensityDpi() { + throw new UnsupportedOperationException(); + } } 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; |