From b7d67e6b7c4a0b37a973d680a2221996bd1f7e3d Mon Sep 17 00:00:00 2001
From: Guang Zhu <guangzhu@google.com>
Date: Mon, 6 Dec 2010 14:09:11 -0800
Subject: [PATCH 1/4] add Calculator tests into continous run

Change-Id: Id9e46543e04102b237cae924bfe0f8da68bfe7fc
---
 testrunner/test_defs.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index a7c65db85..de0b27271 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -408,7 +408,8 @@ See test_defs.xsd for more information.
 <test name="calculator"
     build_path="packages/apps/Calculator"
     package="com.android.calculator2.tests"
-    coverage_target="Calculator" />
+    coverage_target="Calculator"
+    continuous="true" />
 
 <test name="calendar"
     build_path="packages/apps/Calendar"

From 327b8aa802ae97956fdbfbd53b75d263daaa2875 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Mon, 6 Dec 2010 16:33:25 -0800
Subject: [PATCH 2/4] USB driver: update to public rev 4

Change-Id: Icecde3b08876a939db3f170ba9a4b23260df336f
---
 host/windows/usb/android_winusb.inf | 61 +++++------------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index 63b4beadb..47cf2f772 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@ Signature           = "$Windows NT$"
 Class               = AndroidUsbDeviceClass
 ClassGuid           = {3F966BD9-FA04-4ec5-991C-D326973B5128}
 Provider            = %ProviderName%
-DriverVer           = 08/11/2009,2.0.0010.00002
+DriverVer           = 12/06/2010,4.0.0000.00000
 CatalogFile.NTx86   = androidwinusb86.cat
 CatalogFile.NTamd64 = androidwinusba64.cat
 
@@ -43,26 +43,6 @@ HKR,,Icon,,-1
 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E22&MI_01
-;
-; Dell's Mini5
-%SingleAdbInterface%        = USB_Install, USB\VID_413C&PID_B007
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01
-;
-; Samsung SPH-M900, GT-I5700, SCH-R880
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681C
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681C&MI_01
-; Samsung GT-I7500
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6601
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6601&MI_01
-; Samsung GT-I5500
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6882
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6882&MI_01
-; Samsung SHW-M100S
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6850
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6850&MI_01
-; Samsung SHW-M110S
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681D
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681D&MI_01
 
 [Google.NTamd64]
 ; HTC Dream
@@ -82,29 +62,6 @@ HKR,,Icon,,-1
 %SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 %CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E22&MI_01
-;
-; Dell's Mini5
-%SingleAdbInterface%        = USB_Install, USB\VID_413C&PID_B007
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01
-;
-; Samsung SPH-M900, GT-I5700, SCH-R880
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681C
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681C&MI_01
-; Samsung GT-I7500
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6601
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6601&MI_01
-; Samsung GT-I5500
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6882
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6882&MI_01
-; Samsung SHW-M100S
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_6850
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_6850&MI_01
-; Samsung SHW-M110S
-%SingleAdbInterface%        = USB_Install, USB\VID_04E8&PID_681D
-%CompositeAdbInterface%     = USB_Install, USB\VID_04E8&PID_681D&MI_01
-=======
-%CompositeAdbInterface%     = USB_Install, USB\VID_413C&PID_B007&MI_01
->>>>>>> 4e75b80a
 
 [USB_Install]
 Include = winusb.inf
@@ -125,7 +82,7 @@ ServiceBinary   = %12%\WinUSB.sys
 KmdfService = WINUSB, WinUSB_Install
 
 [WinUSB_Install]
-KmdfLibraryVersion  = 1.7
+KmdfLibraryVersion  = 1.9
 
 [USB_Install.HW]
 AddReg  = Dev_AddReg
@@ -138,11 +95,11 @@ AddReg    = CoInstallers_AddReg
 CopyFiles = CoInstallers_CopyFiles
 
 [CoInstallers_AddReg]
-HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01007.dll,WdfCoInstaller","WinUSBCoInstaller.dll"
+HKR,,CoInstallers32,0x00010000,"WdfCoInstaller01009.dll,WdfCoInstaller","WinUSBCoInstaller2.dll"
 
 [CoInstallers_CopyFiles]
-WinUSBCoInstaller.dll
-WdfCoInstaller01007.dll
+WinUSBCoInstaller2.dll
+WdfCoInstaller01009.dll
 
 [DestinationDirs]
 CoInstallers_CopyFiles=11
@@ -152,12 +109,12 @@ CoInstallers_CopyFiles=11
 2 = %DISK_NAME%,,,\amd64
 
 [SourceDisksFiles.x86]
-WinUSBCoInstaller.dll  = 1
-WdfCoInstaller01007.dll = 1
+WinUSBCoInstaller2.dll  = 1
+WdfCoInstaller01009.dll = 1
 
 [SourceDisksFiles.amd64]
-WinUSBCoInstaller.dll  = 2
-WdfCoInstaller01007.dll = 2
+WinUSBCoInstaller2.dll  = 2
+WdfCoInstaller01009.dll = 2
 
 [Strings]
 ProviderName                = "Google, Inc."

From 17dc3b39090c1f5b76f9a5458927e41985588db2 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 6 Dec 2010 15:03:26 -0800
Subject: [PATCH 3/4] Updates for style changes

Change-Id: Id52a0436f58ed8f5cdbffea663a0ec35b6f036aa
---
 samples/ApiDemos/res/layout/dialog_activity.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/ApiDemos/res/layout/dialog_activity.xml b/samples/ApiDemos/res/layout/dialog_activity.xml
index 42a775375..4acdc644b 100644
--- a/samples/ApiDemos/res/layout/dialog_activity.xml
+++ b/samples/ApiDemos/res/layout/dialog_activity.xml
@@ -26,7 +26,7 @@
     <TextView android:id="@+id/text"
         android:layout_width="wrap_content" android:layout_height="wrap_content"
         android:gravity="center_vertical|center_horizontal"
-        android:textStyle="?android:attr/textAppearanceMedium"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/dialog_activity_text"/>
         
     <!-- Container in which we are going to add and remove views, to demonstrate
@@ -38,14 +38,14 @@
     </LinearLayout>
     
     <!-- Alert dialog style buttons along the bottom. -->
-    <LinearLayout style="?android:attr/alertDialogButtonGroupStyle"
+    <LinearLayout style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent" android:layout_height="wrap_content"
         android:measureWithLargestChild="true">
-        <Button style="?android:attr/borderlessButtonStyle" android:id="@+id/add"
+        <Button style="?android:attr/buttonBarButtonStyle" android:id="@+id/add"
             android:layout_width="wrap_content" android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/dialog_activity_add" />
-        <Button style="?android:attr/borderlessButtonStyle" android:id="@+id/remove"
+        <Button style="?android:attr/buttonBarButtonStyle" android:id="@+id/remove"
             android:layout_width="wrap_content" android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/dialog_activity_remove" />

From 95d70c37c802a40a231fcd5955437965d4beb662 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@google.com>
Date: Mon, 6 Dec 2010 19:08:00 -0800
Subject: [PATCH 4/4] Update USB driver revision to 4.

Change-Id: I6cb6afa44bb69211d914f4a3237263fb02bdf617
---
 sdk/usbdriver_source.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index d7666eba3..3f9484b3d 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,4 +1,4 @@
-Pkg.Revision=3
+Pkg.Revision=4
 Archive.Os=WINDOWS
 Archive.Arch=ANY
 Extra.Path=usb_driver