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

Merge branch 'master' into honeycomb-release

Browse Source
This commit is contained in:
The Android Automerger
2010-12-07 07:20:43 -08:00
parent 04fe0074ff 14514c6203
commit 733010af2d
4 changed files with 16 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
host/windows/usb/android_winusb.inf
View File

@@ -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."

8
samples/ApiDemos/res/layout/dialog_activity.xml
View File

@@ -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" />

2
sdk/usbdriver_source.properties
View File

@@ -1,4 +1,4 @@
Pkg.Revision=3
Pkg.Revision=4
Archive.Os=WINDOWS
Archive.Arch=ANY
Extra.Path=usb_driver

3
testrunner/test_defs.xml
View File

@@ -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"