LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 26540 into eclair

Browse Source 
* changes:
  Make the Density enum use the int value from the api Density enum.
This commit is contained in:
Android (Google) Code Review
2009-09-23 23:34:38 -04:00
parent 0065232043 252ad3146a
commit 61676a4061
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/configurations/PixelDensityQualifier.java
View File

@@ -40,20 +40,18 @@ public final class PixelDensityQualifier extends ResourceQualifier {
* Screen Orientation enum. * Screen Orientation enum.
*/ */
public static enum Density { public static enum Density {
HIGH("hdpi", 240, "High Density", IDensityBasedResourceValue.Density.HIGH), //$NON-NLS-1$ HIGH("hdpi", "High Density", IDensityBasedResourceValue.Density.HIGH), //$NON-NLS-1$
MEDIUM("mdpi", 160, "Medium Density", IDensityBasedResourceValue.Density.MEDIUM), //$NON-NLS-1$ MEDIUM("mdpi", "Medium Density", IDensityBasedResourceValue.Density.MEDIUM), //$NON-NLS-1$
LOW("ldpi", 120, "Low Density", IDensityBasedResourceValue.Density.LOW), //$NON-NLS-1$ LOW("ldpi", "Low Density", IDensityBasedResourceValue.Density.LOW), //$NON-NLS-1$
NODPI("nodpi", -1, "No Density", IDensityBasedResourceValue.Density.NODPI); //$NON-NLS-1$ NODPI("nodpi", "No Density", IDensityBasedResourceValue.Density.NODPI); //$NON-NLS-1$
private final String mValue; private final String mValue;
private final String mDisplayValue; private final String mDisplayValue;
private final int mDpiValue;
private final IDensityBasedResourceValue.Density mDensity; private final IDensityBasedResourceValue.Density mDensity;
private Density(String value, int dpiValue, String displayValue, private Density(String value, String displayValue,
IDensityBasedResourceValue.Density density) { IDensityBasedResourceValue.Density density) {
mValue = value; mValue = value;
mDpiValue = dpiValue;
mDisplayValue = displayValue; mDisplayValue = displayValue;
mDensity = density; mDensity = density;
} }
@@ -81,7 +79,7 @@ public final class PixelDensityQualifier extends ResourceQualifier {
try { try {
int density = Integer.parseInt(v); int density = Integer.parseInt(v);
for (Density orient : values()) { for (Density orient : values()) {
if (orient.mDpiValue == density) { if (orient.mDensity.getValue() == density) {
return orient; return orient;
} }
} }
@@ -98,12 +96,12 @@ public final class PixelDensityQualifier extends ResourceQualifier {
} }
public int getDpiValue() { public int getDpiValue() {
return mDpiValue; return mDensity.getValue();
} }
public String getLegacyValue() { public String getLegacyValue() {
if (this != NODPI) { if (this != NODPI) {
return String.format("%1$ddpi", mDpiValue); return String.format("%1$ddpi", getDpiValue());
} }
return ""; return "";
@@ -223,7 +221,7 @@ public final class PixelDensityQualifier extends ResourceQualifier {
// if reference is high, we want highest dpi. // if reference is high, we want highest dpi.
// if reference is medium, we'll prefer to scale down high dpi, than scale up low dpi // if reference is medium, we'll prefer to scale down high dpi, than scale up low dpi
// if reference if low, we'll prefer to scale down high than medium (2:1 over 4:3) // if reference if low, we'll prefer to scale down high than medium (2:1 over 4:3)
return mValue.mDpiValue > compareQ.mValue.mDpiValue; return mValue.mDensity.getValue() > compareQ.mValue.mDensity.getValue();
} }
} }