Commit Graph

1622 Commits

Author SHA1 Message Date
Android (Google) Code Review
5a86df98f6 am 03fe616a: (-s ours) Merge change 9552 into donut
Merge commit '03fe616acbea6eb4c34c8f7b852fa2f785005598'

* commit '03fe616acbea6eb4c34c8f7b852fa2f785005598':
  Import revised translations.  DO NOT MERGE
2009-08-04 11:03:02 -07:00
Android (Google) Code Review
03fe616acb Merge change 9552 into donut
* changes:
  Import revised translations.  DO NOT MERGE
2009-08-04 10:58:59 -07:00
Jean-Baptiste Queru
2574949b85 merge from open-source master 2009-08-04 09:00:16 -07:00
Xavier Ducrohet
31192b9309 am 66f17e50: ApiDemos Clean up
Merge commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9'

* commit '66f17e50dbb42bc529dd12b2f26729f114b1a1a9':
  ApiDemos Clean up
2009-08-03 19:09:37 -07:00
Xavier Ducrohet
66f17e50db ApiDemos Clean up
- Add missing @Override
- Remove (some) unused imports
- Add some missing headers

BUG: 2031807
2009-08-03 19:00:36 -07:00
Eric Fischer
0c9bf956f0 Import revised translations. DO NOT MERGE 2009-08-03 16:16:29 -07:00
Android (Google) Code Review
64f1262c18 am 8ebbef7e: Merge change 9535 into donut
Merge commit '8ebbef7eff1d0942876e5d71dbc0c55eda0bd527'

* commit '8ebbef7eff1d0942876e5d71dbc0c55eda0bd527':
  Fix the DeviceChooserDialog table issues.
2009-08-03 14:28:14 -07:00
Android (Google) Code Review
8ebbef7eff Merge change 9535 into donut
* changes:
  Fix the DeviceChooserDialog table issues.
2009-08-03 14:26:37 -07:00
Xavier Ducrohet
2f39cedad3 Fix the DeviceChooserDialog table issues.
On Linux, the gtk table seems to resize itself automatically when the
layout is computed and forces the last column to resize itself at +18 pixels.
This has a problematic impact on this dialog as it is not resizable and is
made to match the size of the content. As the dialog is used time after time
the last column grows by 18 pixels at every use up to a point where it
doesn't fit the screen.
Since storing the columns size is not that useful and I couldn't find a
way to ignore this first resize, I'm just removing the width storage.
2009-08-03 14:23:16 -07:00
Xavier Ducrohet
8bae53e39e am bd133701: Fix PlatformTarget#compareTo(IAndroidTarget) again.
Merge commit 'bd133701171c4903041a47be982fec4a1fa98b42'

* commit 'bd133701171c4903041a47be982fec4a1fa98b42':
  Fix PlatformTarget#compareTo(IAndroidTarget) again.
2009-08-03 13:50:48 -07:00
Xavier Ducrohet
bd13370117 Fix PlatformTarget#compareTo(IAndroidTarget) again. 2009-08-03 13:46:27 -07:00
Jean-Baptiste Queru
94d3d59106 merge from donut 2009-08-03 07:45:28 -07:00
Xavier Ducrohet
86e2ab6126 am d08cf83a: Minor fix to the plug-ins license.
Merge commit 'd08cf83aace1c40952cc57fa1a12bc3891565250'

* commit 'd08cf83aace1c40952cc57fa1a12bc3891565250':
  Minor fix to the plug-ins license.
2009-07-31 17:42:38 -07:00
Xavier Ducrohet
d08cf83aac Minor fix to the plug-ins license. 2009-07-31 17:35:24 -07:00
Android (Google) Code Review
c87678e9a5 am 60a735fd: Merge change 9352 into donut
Merge commit '60a735fda1f9d7c24c577853304d486b0109632f'

* commit '60a735fda1f9d7c24c577853304d486b0109632f':
  ADT: fix PreCompilerBuilder to use minSdkVersion as a string, not an int.
2009-07-31 11:05:43 -07:00
Android (Google) Code Review
60a735fda1 Merge change 9352 into donut
* changes:
  ADT: fix PreCompilerBuilder to use minSdkVersion as a string, not an int.
2009-07-31 11:01:45 -07:00
Android (Google) Code Review
586e3d16b0 am f19a3083: Merge change 9239 into donut
Merge commit 'f19a3083e77eeab2026436e4d04329d4b5aba8bf'

* commit 'f19a3083e77eeab2026436e4d04329d4b5aba8bf':
  Since bug 1966269 is fixed, marking calprov tests as continuous=true
2009-07-31 10:58:50 -07:00
Android (Google) Code Review
f19a3083e7 Merge change 9239 into donut
* changes:
  Since bug 1966269 is fixed, marking calprov tests as continuous=true
2009-07-31 10:55:10 -07:00
Raphael
1d3395b25b ADT: fix PreCompilerBuilder to use minSdkVersion as a string, not an int. 2009-07-31 13:17:52 -04:00
Android (Google) Code Review
0a0f32a889 Merge change 9223
* changes:
  adding sample cod to access dom and javascript.
2009-07-31 05:41:46 -07:00
Android (Google) Code Review
60ea4545b4 am d8cc08f7: Merge change 9237 into donut
Merge commit 'd8cc08f75fbb39c40120bcd6f84057f0f5642ce9'

* commit 'd8cc08f75fbb39c40120bcd6f84057f0f5642ce9':
  Move legacy driver binaries to the legacy driver directory
2009-07-30 16:32:46 -07:00
Android (Google) Code Review
d8cc08f75f Merge change 9237 into donut
* changes:
  Move legacy driver binaries to the legacy driver directory
2009-07-30 16:31:12 -07:00
Xavier Ducrohet
bb90a717f2 am 5379e098: Remove section about USB driver as not everything is directly available anymore
Merge commit '5379e0981ebd570faba0dcd13c087f71d856e0f0'

* commit '5379e0981ebd570faba0dcd13c087f71d856e0f0':
  Remove section about USB driver as not everything is directly available anymore
2009-07-30 16:07:37 -07:00
Android (Google) Code Review
60842f0275 am 5281b823: Merge change 9208 into donut
Merge commit '5281b823a046b6eb40f12aeb805462f7d58fdebe'

* commit '5281b823a046b6eb40f12aeb805462f7d58fdebe':
  Support packages with no license.
2009-07-30 16:06:58 -07:00
vchtchetkine
0146e94a4c am f5d51ce4: Add .inf file needed for WinUsb framework installation
Merge commit 'f5d51ce49f4fc22ea7e7fa55fdc38ab8c4c8b1e1'

* commit 'f5d51ce49f4fc22ea7e7fa55fdc38ab8c4c8b1e1':
  Add .inf file needed for WinUsb framework installation
2009-07-30 16:06:41 -07:00
vchtchetkine
2063433d9b am 17851887: Bump up AdbWinApi.dll version and submit prebuilt AdbWinApi.dll
Merge commit '17851887c25d198ec913196df7b851d335614ec9'

* commit '17851887c25d198ec913196df7b851d335614ec9':
  Bump up AdbWinApi.dll version and submit prebuilt AdbWinApi.dll
2009-07-30 16:06:39 -07:00
vchtchetkine
199aeb031d Move legacy driver binaries to the legacy driver directory 2009-07-30 15:05:01 -07:00
Swarna Kumar
8aca5b8afd Since bug 1966269 is fixed, marking calprov tests as continuous=true 2009-07-30 15:03:25 -07:00
Xavier Ducrohet
5379e0981e Remove section about USB driver as not everything is directly available anymore
See development/host/windows/usb/readme.txt
2009-07-30 14:51:37 -07:00
Derek Sollenberger
c356b9f040 adding sample cod to access dom and javascript. 2009-07-30 16:57:07 -04:00
Android (Google) Code Review
5281b823a0 Merge change 9208 into donut
* changes:
  Support packages with no license.
2009-07-30 12:29:27 -07:00
Xavier Ducrohet
c74ace1ebd Support packages with no license. 2009-07-30 12:28:17 -07:00
vchtchetkine
f5d51ce49f Add .inf file needed for WinUsb framework installation 2009-07-30 11:29:57 -07:00
Android (Google) Code Review
45c7a4853f am aa70ca22: Merge change 9077 into donut
Merge commit 'aa70ca22d1e0cf6c15579e2f90b23bfb0f941792'

* commit 'aa70ca22d1e0cf6c15579e2f90b23bfb0f941792':
  Make GestureBuilder build under the SDK.
2009-07-30 11:17:55 -07:00
Android (Google) Code Review
fa020b3ef1 am bf281a9a: Merge change 9072 into donut
Merge commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718'

* commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718':
  Make changes to enable driver build in new location
2009-07-30 09:57:26 -07:00
Android (Google) Code Review
9781a221e4 am f8a2fbab: Merge change 9062 into donut
Merge commit 'f8a2fbab9094d5525179770e00042ac2f85be991'

* commit 'f8a2fbab9094d5525179770e00042ac2f85be991':
  Adds call back to the SDK updater for SDK content notifications.
2009-07-30 09:57:18 -07:00
vchtchetkine
99ef15f2b7 am 1db55021: Copy legacy driver source code as a sample for custom USB drivers
Merge commit '1db55021599137f7bcec830d298f6062b495cd35'

* commit '1db55021599137f7bcec830d298f6062b495cd35':
  Copy legacy driver source code as a sample for custom USB drivers
2009-07-30 09:57:13 -07:00
vchtchetkine
17851887c2 Bump up AdbWinApi.dll version and submit prebuilt AdbWinApi.dll 2009-07-30 08:59:30 -07:00
David 'Digit' Turner
fdd1dd0b04 am eee1675a: Look for Android.mk in /jni by default.
Merge commit 'eee1675aa40d9fcaae3765370f5331e4002d8dd6'

* commit 'eee1675aa40d9fcaae3765370f5331e4002d8dd6':
  Look for Android.mk in $(APP_PROJECT_PATH)/jni by default.
2009-07-30 06:56:55 -07:00
David 'Digit' Turner
273cca94e2 am 197a8fea: Add sample "san-angeles" program to demo OpenGL ES from native code.
Merge commit '197a8fea8e9ae0552b0d20fb5ba4562a851c1bca'

* commit '197a8fea8e9ae0552b0d20fb5ba4562a851c1bca':
  Add sample "san-angeles" program to demo OpenGL ES from native code.
2009-07-30 06:56:49 -07:00
Android (Google) Code Review
aa70ca22d1 Merge change 9077 into donut
* changes:
  Make GestureBuilder build under the SDK.
2009-07-29 18:38:17 -07:00
Xavier Ducrohet
0fd1acd8ac Make GestureBuilder build under the SDK. 2009-07-29 18:31:37 -07:00
Android (Google) Code Review
bf281a9ade Merge change 9072 into donut
* changes:
  Make changes to enable driver build in new location
2009-07-29 18:02:23 -07:00
vchtchetkine
71e765b54c Make changes to enable driver build in new location 2009-07-29 18:00:04 -07:00
Android (Google) Code Review
f8a2fbab90 Merge change 9062 into donut
* changes:
  Adds call back to the SDK updater for SDK content notifications.
2009-07-29 17:45:11 -07:00
Xavier Ducrohet
9057041cf8 Adds call back to the SDK updater for SDK content notifications.
Make ADT reload the SDK when a new package is installed/removed through the
SDK Updater.
2009-07-29 17:36:21 -07:00
David 'Digit' Turner
f5a65ef811 am d7e5aaec: Add OpenGL ES headers to the android-4 platform/stable APIs.
Merge commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9'

* commit 'd7e5aaecd896c0956e229304a7725509ab6e6af9':
  Add OpenGL ES headers to the android-4 platform/stable APIs.
2009-07-29 17:05:15 -07:00
David 'Digit' Turner
961f067b72 am 5c767bb9: Add android-4 sysroot and use project\'s default.properties to get the right target.
Merge commit '5c767bb977506dae81680529044adc9f82b4765a'

* commit '5c767bb977506dae81680529044adc9f82b4765a':
  Add android-4 sysroot and use project's default.properties to get the right target.
2009-07-29 17:05:12 -07:00
vchtchetkine
1db5502159 Copy legacy driver source code as a sample for custom USB drivers
The primary usage for this code is to provide vendors / customers who for some
reasons are not satisfied with WinUsb, with a sample custom driver code that is
compliant with our AdbWinApi.dll. So vendors / customers can build their own
custom USB driver that can be recognized by AdbWinApi, and can be accessible from
adb.exe
2009-07-29 16:25:34 -07:00
Jean-Baptiste Queru
860c67ac9c merge from donut 2009-07-29 14:56:49 -07:00