Commit Graph

4703 Commits

Author SHA1 Message Date
Raphael
bb0f61d73d am 5eafc91a: Merge "merge "SDK: make \'mkstub\' less verbose." from HC. Do not merge." into gingerbread
* commit '5eafc91ad3216561d2287f327580644fb1e04cfb':
  merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
2011-02-04 14:49:19 -08:00
Raphael
5eafc91ad3 Merge "merge "SDK: make 'mkstub' less verbose." from HC. Do not merge." into gingerbread 2011-02-04 14:46:24 -08:00
Xavier Ducrohet
b82c8fad3d am 1cedfdb0: Update samples API level. DO NOT MERGE
* commit '1cedfdb031685dd1376de4063d75fb5b8df04eb6':
  Update samples API level. DO NOT MERGE
2011-02-04 12:52:42 -08:00
Raphael
b82fbc6442 merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
mkstub is the tool used to stub the google_apis maps.jar.
Since we're integrating it in the build, we want to control its verbosity.

Change-Id: I93d7dc6a63426affac008f8ef367a0d79277b59a
2011-02-04 12:35:17 -08:00
Xavier Ducrohet
1cedfdb031 Update samples API level. DO NOT MERGE
Change-Id: Ib6a27e5abcb7cb767dae31c67445b450705ae9af
2011-02-04 12:27:11 -08:00
Raphael
ad402d2b1f resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp
Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
2011-02-03 11:30:41 -08:00
Raphael
27caad9905 am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK."
* commit '343c626adaaf323f13d3d0796cf4c84455496a96':
  SDK: Strip llvm-rs-cc in Windows SDK.
2011-02-03 09:05:11 -08:00
Raphael
d30ec22e43 am 04bb65e7: Merge "SDK: fix win-sdk build errors, make future errors fatal."
* commit '04bb65e7c4cd42ce50fa534807c973dba6cb2720':
  SDK: fix win-sdk build errors, make future errors fatal.
2011-02-03 08:56:31 -08:00
Raphael
343c626ada am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK."
* commit 'b0e81c371883a8f7f2cfa9a01f8b65d4a2423dcf':
  SDK: Strip llvm-rs-cc in Windows SDK.
2011-02-03 08:56:28 -08:00
Raphael
04bb65e7c4 Merge "SDK: fix win-sdk build errors, make future errors fatal." 2011-02-02 13:41:24 -08:00
Raphael
b0e81c3718 Merge "SDK: Strip llvm-rs-cc in Windows SDK." 2011-02-02 13:41:09 -08:00
Raphael
cedf2ba818 SDK: fix win-sdk build errors, make future errors fatal.
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: I97bbe46d705c6683e31bb701222efe6f9da71d70
2011-02-02 11:35:41 -08:00
Raphael
d38c76bdf0 SDK: Strip llvm-rs-cc in Windows SDK.
SDK Bug: 3394374

Change-Id: I46ca70a674da28f265f977a267f81039afe3de7c
2011-02-02 11:35:24 -08:00
David 'Digit' Turner
442064f4a9 am fd2d786d: am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook"
* commit 'fd2d786dd10efc9bf3ce0f5f21fbf80f617286a1':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
2011-02-02 09:53:15 -08:00
David 'Digit' Turner
fd2d786dd1 am 3f33b7b7: Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook"
* commit '3f33b7b742865e0c89e49fd7eb917232c2610a70':
  native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
2011-02-02 09:42:07 -08:00
David 'Digit' Turner
3f33b7b742 Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook" 2011-02-02 03:11:30 -08:00
David 'Digit' Turner
95ae335fd5 native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook
The window field must not be set to NULL in the pre-hook, only the
post-one. See http://code.google.com/p/android/issues/detail?id=14352

Change-Id: Ib6214d47c97766bf4a5e148b6b6707e08366fe36
2011-02-02 00:54:02 +01:00
Raphael Moll
33d8964ce1 am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK."
* commit 'e3ec8442781ac765c760c6096393863a62b6a26d':
  Revamped CustomLocale for the SDK.
2011-02-01 14:31:29 -08:00
Raphael Moll
e3ec844278 am 2fa9bd29: Merge "Revamped CustomLocale for the SDK."
* commit '2fa9bd29f6e6c1694e38f547a5d11e01d5189697':
  Revamped CustomLocale for the SDK.
2011-02-01 14:25:26 -08:00
Raphael Moll
2fa9bd29f6 Merge "Revamped CustomLocale for the SDK." 2011-02-01 14:21:47 -08:00
Nick Pelly
ba29b9b177 am c2860adc: Update sample app for final GB MR API changes.
* commit 'c2860adcb8c8c84927bfe17fadd61b5beea61ae4':
  Update sample app for final GB MR API changes.
2011-02-01 10:11:04 -08:00
Nick Pelly
c2860adcb8 Update sample app for final GB MR API changes.
Change-Id: Ic6b7aa2ffe88f6a9228322d41a2be391eb5bf545
2011-02-01 08:25:46 -08:00
Raphael Moll
bc6fa8a82b Revamped CustomLocale for the SDK.
- Revamped the list UI: replaced the long-press actions by
some stateful buttons. Uses the listview's single choice mode.

- Added a broadcast receiver to be able to change the system
locale using an intent, e.g. sent by adb shell am. This is
convenient for automated testing scripts.

- Changed package namespace to v2. This makes it easier for
an automated testing script to figure that an emulator has the
old version and install the new one side-by-side.

Change-Id: I1849d2b9d55441490b013cfefcca5d8fa48e22bd
2011-01-31 15:22:56 -08:00
Jean-Baptiste Queru
8efcfb5dd0 am c8fd87e4: Delete browserplugin sample. do not merge
* commit 'c8fd87e47685146e2c9b32b4f0bdfa3bb724081b':
  Delete browserplugin sample. do not merge
2011-01-29 08:00:48 -08:00
Jean-Baptiste Queru
c8fd87e476 Delete browserplugin sample. do not merge
It doesn't build in all environments.

Change-Id: I96fbb28e1bea44656ff6cfb9002eedfd5471612e
2011-01-29 07:38:51 -08:00
Raphael
6a691b3ed8 resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp
Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
2011-01-27 21:46:19 -08:00
Jean-Baptiste Queru
b35e113cef am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"
* commit '2d81c413c7b0a1206aae4e45d6dd2bbae0584436':
  Delete browserplugin sample. do not merge
2011-01-27 15:08:13 -08:00
Jean-Baptiste Queru
2d81c413c7 am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"
* commit 'd9af3ac3e2f9f61d541e5c15c3d47bd8e0e6def5':
  Delete browserplugin sample. do not merge
2011-01-27 15:04:57 -08:00
Jean-Baptiste Queru
d9af3ac3e2 Merge "Delete browserplugin sample. do not merge" 2011-01-27 14:42:23 -08:00
Raphael
1adaa57108 unix2dos command, used by win SDK, has been renamed under Lucid.
Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
2011-01-27 14:00:21 -08:00
Jean-Baptiste Queru
dede009a98 Delete browserplugin sample. do not merge
It doesn't build in all environments.

Change-Id: Ib27b73a0f74a79e4138bb128f643206e37f5ea60
2011-01-27 13:35:26 -08:00
Xavier Ducrohet
f356961278 am 82be0899: Update platform version for SDK component. DO NOT MERGE.
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
  Update platform version for SDK component. DO NOT MERGE.
2011-01-27 13:26:06 -08:00
Xavier Ducrohet
82be08990b Update platform version for SDK component. DO NOT MERGE.
Change-Id: I29b8e2345c3c5637839099adf3433e784992e8bb
2011-01-27 10:34:25 -08:00
Jeff Hamilton
28745b4ee5 am 509fbb4d: Sample code for foreground NDEF Push APIs.
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
  Sample code for foreground NDEF Push APIs.
2011-01-26 15:47:51 -08:00
Jeff Hamilton
509fbb4df3 Sample code for foreground NDEF Push APIs. 2011-01-26 17:41:35 -06:00
Jean-Baptiste Queru
b7ea5aca58 am 475bb357: Merge "Current files for source.android.com"
* commit '475bb357dbab0d1a93e489a8213843ab984ae95f':
  Current files for source.android.com
2011-01-26 09:01:56 -08:00
Jean-Baptiste Queru
475bb357db Merge "Current files for source.android.com" 2011-01-26 08:23:47 -08:00
Jean-Baptiste Queru
a6db53f077 Current files for source.android.com
This matches the current state of the live site.

Change-Id: If209bc337d31cf8669e2afb78c9b52e5bbe3cdac
2011-01-25 15:16:28 -08:00
Jeff Hamilton
7a11acd92b am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-25 14:39:53 -08:00
Jeff Hamilton
e0fbd3ffe8 Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
2011-01-25 16:33:33 -06:00
David Turner
1b20f62a9a am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers"
* commit 'dfb9123d750437d050fcbbd7d64e18bf44011234':
  Use __asm__ instead of asm in public libc headers
2011-01-25 09:28:59 -08:00
David Turner
dfb9123d75 Merge "Use __asm__ instead of asm in public libc headers" 2011-01-25 08:49:13 -08:00
Jean-Baptiste Queru
6d0d0d644a am a8d817c9: Merge "source.android.com documentation cleanup"
* commit 'a8d817c9fc93692fac01f6df253a3712e0cf4e34':
  source.android.com documentation cleanup
2011-01-24 15:27:50 -08:00
Jean-Baptiste Queru
a8d817c9fc Merge "source.android.com documentation cleanup" 2011-01-24 15:13:08 -08:00
Dianne Hackborn
42f87e1b47 am e6354845: Merge "Monkey: request am to show the ANR dialog"
* commit 'e635484562dc7f21aa16de3147a100210708c8f8':
  Monkey: request am to show the ANR dialog
2011-01-22 11:52:53 -08:00
Dianne Hackborn
e635484562 Merge "Monkey: request am to show the ANR dialog" 2011-01-22 11:36:43 -08:00
Vairavan Srinivasan
af5e575643 Monkey: request am to show the ANR dialog
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.

Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
2011-01-21 18:00:52 -08:00
Nick Pelly
1717afbca4 am 072bca5b: Add Tag app to eclipse classpath
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
  Add Tag app to eclipse classpath
2011-01-21 10:51:18 -08:00
Nick Pelly
072bca5b09 Add Tag app to eclipse classpath
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
2011-01-21 10:12:17 -08:00
Jeff Brown
f40ea5cfd9 am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
2011-01-20 21:46:27 -08:00