commit a2cd5c5fb264c7363edc9afb32122b899ca69d81
author Siva Velusamy <vsiva@google.com> Tue Oct 09 14:22:13 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 09 14:22:14 2012 -0700
tree 0004052de2c33c67c6619d4fd86d8dc91383cbac
parent 829176d6cd55a19a99f3fe8f7900eb237b04be00
parent d899918690d5e392897e001abfb00b151ba2b13e

Merge "Show dynamic skin if enabled in AVD settings"

android/avd/info.c

diff --git a/android/avd/info.c b/android/avd/info.c
index 3463f6a..0f43de6 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -84,6 +84,9 @@
  */
 #define  SKIN_NAME       "skin.name"
 
+/* the config.ini key that specifies if this AVD should use a dynamic skin */
+#define  SKIN_DYNAMIC    "skin.dynamic"
+
 /* default skin name */
 #define  SKIN_DEFAULT    "HVGA"
 
@@ -1197,6 +1200,14 @@
     return;
 }
 
+int
+avdInfo_shouldUseDynamicSkin( AvdInfo* i)
+{
+    if (i == NULL || i->configIni == NULL)
+        return 0;
+    return iniFile_getBoolean( i->configIni, SKIN_DYNAMIC, "no" );
+}
+
 char*
 avdInfo_getCharmapFile( AvdInfo* i, const char* charmapName )
 {

android/avd/info.h

diff --git a/android/avd/info.h b/android/avd/info.h
index 4388b7c..556ba8e 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -218,6 +218,9 @@
  */
 void         avdInfo_getSkinInfo( AvdInfo*  i, char** pSkinName, char** pSkinDir );
 
+/* Returns whether the AVD specifies the use of a dynamic skin */
+int          avdInfo_shouldUseDynamicSkin( AvdInfo* i);
+
 /* Find a charmap file named <charmapName>.kcm for this AVD.
  * Returns the path of the file on success, or NULL if not found.
  * The result string must be freed by the caller.

android/main.c

diff --git a/android/main.c b/android/main.c
index 4178a6b..f980d27 100644
--- a/android/main.c
+++ b/android/main.c
@@ -324,6 +324,10 @@
         avdInfo_getSkinHardwareIni(avd, opts->skin, opts->skindir);
     }
 
+    if (opts->dynamic_skin == 0) {
+        opts->dynamic_skin = avdInfo_shouldUseDynamicSkin(avd);
+    }
+
     /* Read hardware configuration */
     hw = android_hw;
     if (avdInfo_initHwConfig(avd, hw) < 0) {