aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-10-27 15:33:26 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-10-27 15:33:26 -0700
commiteca6b85e854b5c327fe8cd792e01bb8c1ca5648f (patch)
treeb694580c9f5d3f87a95651efd87017647c5cbb56 /sdkmanager/libs
parentca735de802a9757fca3aa118b5341117ae6e3a90 (diff)
parent2b2b3d0615b8c0a989992599e48ed7acc6d9e372 (diff)
downloadsdk-eca6b85e854b5c327fe8cd792e01bb8c1ca5648f.zip
sdk-eca6b85e854b5c327fe8cd792e01bb8c1ca5648f.tar.gz
sdk-eca6b85e854b5c327fe8cd792e01bb8c1ca5648f.tar.bz2
merge from tools_r8
Change-Id: Id7dbdfae280b98547f9a80e07cc5d80d7f9f92f7
Diffstat (limited to 'sdkmanager/libs')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/resources/Density.java1
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/resources/ScreenSize.java3
2 files changed, 3 insertions, 1 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/Density.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/Density.java
index ac0fb91..c6f5b2a 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/Density.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/Density.java
@@ -23,6 +23,7 @@ package com.android.sdklib.resources;
* as well as other places needing to know the density values.
*/
public enum Density implements ResourceEnum {
+ XHIGH("xhdpi", "X-High Density", 320), //$NON-NLS-1$
HIGH("hdpi", "High Density", 240), //$NON-NLS-1$
MEDIUM("mdpi", "Medium Density", 160), //$NON-NLS-1$
LOW("ldpi", "Low Density", 120), //$NON-NLS-1$
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/ScreenSize.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/ScreenSize.java
index dc94afb..d6fc99d 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/ScreenSize.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/resources/ScreenSize.java
@@ -23,7 +23,8 @@ package com.android.sdklib.resources;
public enum ScreenSize implements ResourceEnum {
SMALL("small", "Small", "Small Screen"), //$NON-NLS-1$
NORMAL("normal", "Normal", "Normal Screen"), //$NON-NLS-1$
- LARGE("large", "Large", "Large Screen"); //$NON-NLS-1$
+ LARGE("large", "Large", "Large Screen"), //$NON-NLS-1$
+ XLARGE("xlarge", "X-Large", "Extra Large Screen"); //$NON-NLS-1$
private final String mValue;
private final String mShortDisplayValue;