am e59d0522: am 3400286c: Merge "Fix project files for DeviceConfig"
* commit 'e59d0522bc9937df9c29651a0bd9c8c1137011b2':
Fix project files for DeviceConfig
diff --git a/apps/DeviceConfig/.classpath b/apps/DeviceConfig/.classpath
index 4f8e887..d3bb07b 100644
--- a/apps/DeviceConfig/.classpath
+++ b/apps/DeviceConfig/.classpath
@@ -1,16 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry kind="lib" path="/home/michaelwr/android-sdks/platforms/android-15/android.jar">
- <attributes>
- <attribute name="javadoc_location" value="file:/home/michaelwr/android-sdks/docs/reference"/>
- </attributes>
- <accessrules>
- <accessrule kind="nonaccessible" pattern="com/android/internal/**"/>
- </accessrules>
- </classpathentry>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/apps/DeviceConfig/README.txt b/apps/DeviceConfig/README.txt
new file mode 100644
index 0000000..bbf0557
--- /dev/null
+++ b/apps/DeviceConfig/README.txt
@@ -0,0 +1,6 @@
+This project can be run on a device to populate some default values
+for a vendor device description (such as the ones found in
+tools/base/files/devices.xml).
+
+Note that some of the values must be edited afterwards, so be sure to
+read the UPDATE_DEVICES.txt file in that directory.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/DeviceMenuListener.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/DeviceMenuListener.java
index ccfa786..4890fe5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/DeviceMenuListener.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/DeviceMenuListener.java
@@ -202,6 +202,8 @@
String name = d.getName();
Screen screen = d.getDefaultHardware().getScreen();
float length = (float) screen.getDiagonalLength();
+ // Round dimensions to the nearest tenth
+ length = Math.round(10 * length) / 10.0f;
return String.format(java.util.Locale.US, "%1$s (%3$s\", %2$s)",
name, getResolutionString(d), Float.toString(length));
}
