Raphael Moll
ae43104493
am 33d8964c: am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK."
...
* commit '33d8964ce12e438e70456be368bbbf2702efb05b':
Revamped CustomLocale for the SDK.
2011-02-01 14:48:40 -08: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
1501492cfb
am f0f3e98f: DO NOT MERGE
...
* commit 'f0f3e98f10846f805657daa69e8d21e5b5717a9f':
DO NOT MERGE
2011-02-01 11:50:22 -08:00
Nick Pelly
f0f3e98f10
DO NOT MERGE
...
Cherry-pick from GB to HC.
Update sample app for final GB MR API changes.
Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad
2011-02-01 11:16:06 -08:00
Nick Pelly
52e42d3f85
am ba29b9b1: am c2860adc: Update sample app for final GB MR API changes.
...
* commit 'ba29b9b17769995d7fba7dea09934d2e11bf5ffb':
Update sample app for final GB MR API changes.
2011-02-01 10:22:12 -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
Xavier Ducrohet
8e05fb8749
am 75b7bb25: Add Clang includes to the SDK for Renderscript
...
* commit '75b7bb2521a9e8be84f24f2860870f13e9e5d263':
Add Clang includes to the SDK for Renderscript
2011-01-31 18:31:37 -08:00
Xavier Ducrohet
75b7bb2521
Add Clang includes to the SDK for Renderscript
...
Change-Id: I247f5c1480799868792871ea68c7765fbbc01fa6
2011-01-31 16:37:33 -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
The Android Open Source Project
9f0fe782e5
Reconcile gingerbread-plus-aosp and honeycomb
...
Change-Id: I3249b581cf8e77253f3225ac3b158019b0a75c64
2011-01-30 12:39:58 -08:00
The Android Open Source Project
88f1271196
Mass merge from gingerbread - do not merge
...
Change-Id: I1fadb096a42c4905d243428a91025ecb759443cc
2011-01-30 12:39:58 -08:00
Jean-Baptiste Queru
ce2fdae0e6
Merge 1adaa571 from gingerbread
...
Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
2011-01-29 11:13:54 -08:00
Xavier Ducrohet
8f823fd4a4
am 82be0899: (-s ours) Update platform version for SDK component. DO NOT MERGE.
...
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
Update platform version for SDK component. DO NOT MERGE.
2011-01-29 10:39:56 -08:00
Jeff Hamilton
59592336d5
am 509fbb4d: Sample code for foreground NDEF Push APIs.
...
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
Sample code for foreground NDEF Push APIs.
2011-01-29 09:55:03 -08:00
Jean-Baptiste Queru
ebcbca43e3
am 8efcfb5d: (-s ours) am c8fd87e4: Delete browserplugin sample. do not merge
...
* commit '8efcfb5dd06e89215a9e119a81a8a05be6c8af7a':
Delete browserplugin sample. do not merge
2011-01-29 09:35:57 -08:00
Jeff Hamilton
6a16ba335f
am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
...
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-29 09:32:16 -08:00
Raphael
b24ee05ba0
am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp
...
* commit '6a691b3ed872ed42d83ef52a0f975cfc5b3c638a':
unix2dos command, used by win SDK, has been renamed under Lucid.
2011-01-29 08:56:53 -08:00
Jean-Baptiste Queru
9ed77afe2c
am b35e113c: (-s ours) am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"
...
* commit 'b35e113cef040b9e8c8907341a2f94e420f7d108':
Delete browserplugin sample. do not merge
2011-01-29 08:03:16 -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
Scott Main
f8faaaf16c
am 82b3a46c: set minsdkversion for hc demo to 11
...
* commit '82b3a46caddb507b67de0362e4ca85ac3187ae05':
set minsdkversion for hc demo to 11
2011-01-28 11:56:34 -08:00
Scott Main
82b3a46cad
set minsdkversion for hc demo to 11
...
Change-Id: I21bdf56424fe1f63cad1c8e99fb6285ecbfc28f4
2011-01-28 11:22:09 -08:00
Xavier Ducrohet
9eef4708c1
am f3569612: (-s ours) am 82be0899: Update platform version for SDK component. DO NOT MERGE.
...
* commit 'f356961278c7f1384769d592e2ecacf24d6ad21b':
Update platform version for SDK component. DO NOT MERGE.
2011-01-28 09:25:35 -08:00
Dianne Hackborn
9d31b40732
am c6572ed6: Merge "Add new samples for explicit alert dialog themes." into honeycomb
...
* commit 'c6572ed63d9388e45d1aea75b80aad9bd3d3b2b0':
Add new samples for explicit alert dialog themes.
2011-01-27 22:50:48 -08:00
Dianne Hackborn
c6572ed63d
Merge "Add new samples for explicit alert dialog themes." into honeycomb
2011-01-27 22:47:21 -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
Nick Pelly
b41b0e5b13
am 072bca5b: Add Tag app to eclipse classpath
...
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
Add Tag app to eclipse classpath
2011-01-27 21:43:02 -08:00
Jeff Brown
a08ba29823
am 98ab3219: (-s ours) Prevent monkey from turning off the screen. (DO NOT MERGE)
...
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
Prevent monkey from turning off the screen. (DO NOT MERGE)
2011-01-27 21:21:07 -08:00
Alexander Lucas
a029474d6c
am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
...
* commit 'a057567484888f206cd70ecc2dcb269b16f23718':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
2011-01-27 18:28:36 -08:00
Dianne Hackborn
e36d13b70d
Add new samples for explicit alert dialog themes.
...
Change-Id: I1e306c0786952ab391c479a9322065efd8566ca7
2011-01-27 16:35:02 -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
Scott Main
f43f31761a
am 44a6ed7b: Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
...
* commit '44a6ed7b3ff5080dc18f821d83852e331d7a3891':
change notepad min sdk version to 11 and adjust action item appearance
2011-01-27 15:07:01 -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
Scott Main
44a6ed7b3f
Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
2011-01-27 15:02:52 -08:00
Scott Main
29ecb2f11d
change notepad min sdk version to 11 and adjust action item appearance
...
Change-Id: I5385067b2720ebb053565cadcfe725103165abb8
2011-01-27 14:58:55 -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
Jack Palevich
536d8b9f78
am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
2011-01-27 09:18:16 -08:00
Xavier Ducrohet
ae760d9489
am 7eada540: (-s ours) Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
...
* commit '7eada54037b5476bfc1cc4a3e8933defa0b04096':
Move SDK component to 2.4 - DO NOT MERGE.
2011-01-27 08:48:40 -08:00
Jaikumar Ganesh
5a87804c87
am 1b608620: (-s ours) Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '1b6086207f2b06fb2647428e6210c2aefc6a930a':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-27 08:12:00 -08:00
Elliott Hughes
71dbb060ca
am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit 'ed6b76c670658390a43e199f9dc199d85483300a':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-27 08:10:42 -08:00
Jeff Hamilton
71a96a345a
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
2011-01-26 21:14:42 -08:00
Eric Fischer
3809ac2916
am 23c0080a: Import revised translations.
...
* commit '23c0080a10b7ae694849cf820e55a54333d7f37a':
Import revised translations.
2011-01-26 17:37:34 -08:00
Jeff Hamilton
fa378cddf3
am 28745b4e: am 509fbb4d: Sample code for foreground NDEF Push APIs.
...
* commit '28745b4ee52ef4864f9bdaed1d5e1cb9ac849b15':
Sample code for foreground NDEF Push APIs.
2011-01-26 16:57:49 -08:00