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

Merge change 5761 into donut

Browse Source 
* changes:
  Misc cleanup from a previous commit.
This commit is contained in:
Android (Google) Code Review
2009-06-30 00:58:46 -07:00
parent 5dffb0649b c851d71fa2
commit d63563fbb0
3 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/sdkmanager/app/src/com/android/sdkmanager/Main.java
View File

@@ -612,14 +612,11 @@ class Main {
valid = true; valid = true;
// get the hardware properties for this skin // get the hardware properties for this skin
File skinFile = avdManager.getSkinPath(skin, target); File skinFolder = avdManager.getSkinPath(skin, target);
if (skinFile.isDirectory()) { // this should not fail since we got the skin File skinHardwareFile = new File(skinFolder, AvdManager.HARDWARE_INI);
// name from the target if (skinHardwareFile.isFile()) {
File skinHardwareFle = new File(skinFile, AvdManager.HARDWARE_INI); skinHardwareConfig = SdkManager.parsePropertyFile(
if (skinHardwareFle.isFile()) { skinHardwareFile, mSdkLog);
skinHardwareConfig = SdkManager.parsePropertyFile(
skinHardwareFle, mSdkLog);
}
} }
break; break;
} }

60
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/avd/AvdManager.java
View File

@@ -57,10 +57,10 @@ public final class AvdManager {
} }
} }
public static final String AVD_FOLDER_EXTENSION = ".avd"; public static final String AVD_FOLDER_EXTENSION = ".avd"; //$NON-NLS-1$
public final static String AVD_INFO_PATH = "path"; public final static String AVD_INFO_PATH = "path"; //$NON-NLS-1$
public final static String AVD_INFO_TARGET = "target"; public final static String AVD_INFO_TARGET = "target"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing the SDK-relative path of the skin folder, if any, * AVD/config.ini key name representing the SDK-relative path of the skin folder, if any,
@@ -68,14 +68,14 @@ public final class AvdManager {
* *
* @see #NUMERIC_SKIN_SIZE * @see #NUMERIC_SKIN_SIZE
*/ */
public final static String AVD_INI_SKIN_PATH = "skin.path"; public final static String AVD_INI_SKIN_PATH = "skin.path"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing an UI name for the skin. * AVD/config.ini key name representing an UI name for the skin.
* This config key is ignored by the emulator. It is only used by the SDK manager or * This config key is ignored by the emulator. It is only used by the SDK manager or
* tools to give a friendlier name to the skin. * tools to give a friendlier name to the skin.
* If missing, use the {@link #AVD_INI_SKIN_PATH} key instead. * If missing, use the {@link #AVD_INI_SKIN_PATH} key instead.
*/ */
public final static String AVD_INI_SKIN_NAME = "skin.name"; public final static String AVD_INI_SKIN_NAME = "skin.name"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing the path to the sdcard file. * AVD/config.ini key name representing the path to the sdcard file.
* If missing, the default name "sdcard.img" will be used for the sdcard, if there's such * If missing, the default name "sdcard.img" will be used for the sdcard, if there's such
@@ -83,14 +83,14 @@ public final class AvdManager {
* *
* @see #SDCARD_IMG * @see #SDCARD_IMG
*/ */
public final static String AVD_INI_SDCARD_PATH = "sdcard.path"; public final static String AVD_INI_SDCARD_PATH = "sdcard.path"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing the size of the SD card. * AVD/config.ini key name representing the size of the SD card.
* This property is for UI purposes only. It is not used by the emulator. * This property is for UI purposes only. It is not used by the emulator.
* *
* @see #SDCARD_SIZE_PATTERN * @see #SDCARD_SIZE_PATTERN
*/ */
public final static String AVD_INI_SDCARD_SIZE = "sdcard.size"; public final static String AVD_INI_SDCARD_SIZE = "sdcard.size"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing the first path where the emulator looks * AVD/config.ini key name representing the first path where the emulator looks
* for system images. Typically this is the path to the add-on system image or * for system images. Typically this is the path to the add-on system image or
@@ -98,43 +98,44 @@ public final class AvdManager {
* <p/> * <p/>
* The emulator looks at {@link #AVD_INI_IMAGES_1} before {@link #AVD_INI_IMAGES_2}. * The emulator looks at {@link #AVD_INI_IMAGES_1} before {@link #AVD_INI_IMAGES_2}.
*/ */
public final static String AVD_INI_IMAGES_1 = "image.sysdir.1"; public final static String AVD_INI_IMAGES_1 = "image.sysdir.1"; //$NON-NLS-1$
/** /**
* AVD/config.ini key name representing the second path where the emulator looks * AVD/config.ini key name representing the second path where the emulator looks
* for system images. Typically this is the path to the platform system image. * for system images. Typically this is the path to the platform system image.
* *
* @see #AVD_INI_IMAGES_1 * @see #AVD_INI_IMAGES_1
*/ */
public final static String AVD_INI_IMAGES_2 = "image.sysdir.2"; public final static String AVD_INI_IMAGES_2 = "image.sysdir.2"; //$NON-NLS-1$
/** /**
* Pattern to match pixel-sized skin "names", e.g. "320x480". * Pattern to match pixel-sized skin "names", e.g. "320x480".
*/ */
public final static Pattern NUMERIC_SKIN_SIZE = Pattern.compile("[0-9]{2,}x[0-9]{2,}"); public final static Pattern NUMERIC_SKIN_SIZE = Pattern.compile("[0-9]{2,}x[0-9]{2,}"); //$NON-NLS-1$
private final static String USERDATA_IMG = "userdata.img"; private final static String USERDATA_IMG = "userdata.img"; //$NON-NLS-1$
private final static String CONFIG_INI = "config.ini"; private final static String CONFIG_INI = "config.ini"; //$NON-NLS-1$
private final static String SDCARD_IMG = "sdcard.img"; private final static String SDCARD_IMG = "sdcard.img"; //$NON-NLS-1$
private final static String INI_EXTENSION = ".ini"; private final static String INI_EXTENSION = ".ini"; //$NON-NLS-1$
private final static Pattern INI_NAME_PATTERN = Pattern.compile("(.+)\\" + INI_EXTENSION + "$", private final static Pattern INI_NAME_PATTERN = Pattern.compile("(.+)\\" + //$NON-NLS-1$
INI_EXTENSION + "$", //$NON-NLS-1$
Pattern.CASE_INSENSITIVE); Pattern.CASE_INSENSITIVE);
private final static Pattern IMAGE_NAME_PATTERN = Pattern.compile("(.+)\\.img$", private final static Pattern IMAGE_NAME_PATTERN = Pattern.compile("(.+)\\.img$", //$NON-NLS-1$
Pattern.CASE_INSENSITIVE); Pattern.CASE_INSENSITIVE);
/** /**
* Pattern for matching SD Card sizes, e.g. "4K" or "16M". * Pattern for matching SD Card sizes, e.g. "4K" or "16M".
*/ */
public final static Pattern SDCARD_SIZE_PATTERN = Pattern.compile("\\d+[MK]"); public final static Pattern SDCARD_SIZE_PATTERN = Pattern.compile("\\d+[MK]"); //$NON-NLS-1$
/** Regex used to validate characters that compose an AVD name. */ /** Regex used to validate characters that compose an AVD name. */
public final static Pattern RE_AVD_NAME = Pattern.compile("[a-zA-Z0-9._-]+"); public final static Pattern RE_AVD_NAME = Pattern.compile("[a-zA-Z0-9._-]+"); //$NON-NLS-1$
/** List of valid characters for an AVD name. Used for display purposes. */ /** List of valid characters for an AVD name. Used for display purposes. */
public final static String CHARS_AVD_NAME = "a-z A-Z 0-9 . _ -"; public final static String CHARS_AVD_NAME = "a-z A-Z 0-9 . _ -"; //$NON-NLS-1$
public final static String HARDWARE_INI = "hardware.ini"; public final static String HARDWARE_INI = "hardware.ini"; //$NON-NLS-1$
/** An immutable structure describing an Android Virtual Device. */ /** An immutable structure describing an Android Virtual Device. */
public static final class AvdInfo { public static final class AvdInfo {
@@ -612,17 +613,14 @@ public final class AvdManager {
} }
// get the hardware properties for this skin // get the hardware properties for this skin
File skinFile = getSkinPath(skinName, target); File skinFolder = getSkinPath(skinName, target);
if (skinFile.isDirectory()) { // this should not fail since we got the skin File skinHardwareFile = new File(skinFolder, AvdManager.HARDWARE_INI);
// name from the target if (skinHardwareFile.isFile()) {
File skinHardwareFile = new File(skinFile, AvdManager.HARDWARE_INI); Map<String, String> skinHardwareConfig = SdkManager.parsePropertyFile(
if (skinHardwareFile.isFile()) { skinHardwareFile, mSdkLog);
Map<String, String> skinHardwareConfig = SdkManager.parsePropertyFile( if (skinHardwareConfig != null) {
skinHardwareFile, mSdkLog); finalHardwareValues.putAll(skinHardwareConfig);
if (skinHardwareConfig != null) { values.putAll(skinHardwareConfig);
finalHardwareValues.putAll(skinHardwareConfig);
values.putAll(skinHardwareConfig);
}
} }
} }

3
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
View File

@@ -200,6 +200,7 @@ public final class AvdSelector {
Button newButton = new Button(buttons, SWT.PUSH | SWT.FLAT); Button newButton = new Button(buttons, SWT.PUSH | SWT.FLAT);
newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
newButton.setText("New..."); newButton.setText("New...");
// TODO handle 'new' button.
Button deleteButton = new Button(buttons, SWT.PUSH | SWT.FLAT); Button deleteButton = new Button(buttons, SWT.PUSH | SWT.FLAT);
deleteButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); deleteButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -545,7 +546,7 @@ public final class AvdSelector {
} }
//whether or not we display details. default: true when not in SIMPLE_CHECK mode. // whether or not we display details. default: true when not in SIMPLE_CHECK mode.
boolean showDetails = mDisplayMode != DisplayMode.SIMPLE_CHECK; boolean showDetails = mDisplayMode != DisplayMode.SIMPLE_CHECK;
if (mSelectionListener != null) { if (mSelectionListener != null) {