commit f6b7dd7e7d6cd9c8ee18f6b8c9fba2f26a50bd35
author Jean-Michel Trivi <jmtrivi@google.com> Thu May 10 09:55:15 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 10 09:55:15 2012 -0700
tree 73759ba62a4c72cf3880c68828c7a3d1f481e9ee
parent 6bd1ae5e75a7ac67a72d15d6f0900284eaa4ea51
parent cb62e8bf2844266fd6fdcf8fd1ead7e1f2f08d92

Merge "Add FLAC encoder to the list of media codecs." into jb-dev

build/sdk.atree

diff --git a/build/sdk.atree b/build/sdk.atree
index 87a3c07..6d0d20b 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -71,15 +71,16 @@
 obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl
 
 # emulator skins from sdk.git
-development/tools/emulator/skins/QVGA      platforms/${PLATFORM_NAME}/skins/QVGA
-development/tools/emulator/skins/WQVGA432  platforms/${PLATFORM_NAME}/skins/WQVGA432
-development/tools/emulator/skins/WQVGA400  platforms/${PLATFORM_NAME}/skins/WQVGA400
-development/tools/emulator/skins/HVGA      platforms/${PLATFORM_NAME}/skins/HVGA
-development/tools/emulator/skins/WVGA800   platforms/${PLATFORM_NAME}/skins/WVGA800
-development/tools/emulator/skins/WVGA854   platforms/${PLATFORM_NAME}/skins/WVGA854
-development/tools/emulator/skins/WSVGA     platforms/${PLATFORM_NAME}/skins/WSVGA
-development/tools/emulator/skins/WXGA720   platforms/${PLATFORM_NAME}/skins/WXGA720
-development/tools/emulator/skins/WXGA800   platforms/${PLATFORM_NAME}/skins/WXGA800
+development/tools/emulator/skins/QVGA          platforms/${PLATFORM_NAME}/skins/QVGA
+development/tools/emulator/skins/WQVGA432      platforms/${PLATFORM_NAME}/skins/WQVGA432
+development/tools/emulator/skins/WQVGA400      platforms/${PLATFORM_NAME}/skins/WQVGA400
+development/tools/emulator/skins/HVGA          platforms/${PLATFORM_NAME}/skins/HVGA
+development/tools/emulator/skins/WVGA800       platforms/${PLATFORM_NAME}/skins/WVGA800
+development/tools/emulator/skins/WVGA854       platforms/${PLATFORM_NAME}/skins/WVGA854
+development/tools/emulator/skins/WSVGA         platforms/${PLATFORM_NAME}/skins/WSVGA
+development/tools/emulator/skins/WXGA720       platforms/${PLATFORM_NAME}/skins/WXGA720
+development/tools/emulator/skins/WXGA800       platforms/${PLATFORM_NAME}/skins/WXGA800
+development/tools/emulator/skins/WXGA800-7in   platforms/${PLATFORM_NAME}/skins/WXGA800-7in
 
 # Platform SDK properties
 development/sdk/sdk.properties               platforms/${PLATFORM_NAME}/sdk.properties

tools/emulator/skins/WXGA800-7in/hardware.ini

diff --git a/tools/emulator/skins/WXGA800-7in/hardware.ini b/tools/emulator/skins/WXGA800-7in/hardware.ini
index af07068..43aae6d 100755
--- a/tools/emulator/skins/WXGA800-7in/hardware.ini
+++ b/tools/emulator/skins/WXGA800-7in/hardware.ini
@@ -3,4 +3,5 @@
 vm.heapSize=48
 hw.ramSize=1024
 hw.keyboard.lid=no
+hw.mainKeys=no