Nick Kralevich
41681e0be1
new SaveTag activity, additional utilities
...
The SaveTag activity will receive an intent with the
contents of the NdefRecord, and will be responsible
for commiting that record to the database.
Add NdefUtil, which can convert an NdefRecord
to a URI, and vise-versa.
Change-Id: Icf8682a00774da6e246961d34de5bc5baa7550cb
2010-10-04 09:34:39 -07:00
Dianne Hackborn
bf895af17d
New API demo showing different screen orientation options.
...
Change-Id: I75b206f86ee87b50cccc5e23140d55bd566781cd
2010-10-02 16:56:56 -07:00
Nick Kralevich
6f6a7107ac
am 12f3e97c: am e97e78a0: Make unittests work, new TagBroadcastReceiver
...
Merge commit '12f3e97c7a011cab7b13caeff308da380a62f6b8'
* commit '12f3e97c7a011cab7b13caeff308da380a62f6b8':
Make unittests work, new TagBroadcastReceiver
2010-10-01 17:08:23 -07:00
Nick Kralevich
12f3e97c7a
am e97e78a0: Make unittests work, new TagBroadcastReceiver
...
Merge commit 'e97e78a0600e08b0e84edee96aea81145c0df44c' into gingerbread-plus-aosp
* commit 'e97e78a0600e08b0e84edee96aea81145c0df44c':
Make unittests work, new TagBroadcastReceiver
2010-10-01 16:16:30 -07:00
Nick Kralevich
e97e78a060
Make unittests work, new TagBroadcastReceiver
...
Change-Id: I5a3a1938a7fb91c8114447d24427f2c263bda5a3
2010-10-01 16:09:03 -07:00
Brad Fitzpatrick
4006b3e9fa
am feebca8b: am 9c1a73ba: Update Monkey to new StrictMode API.
...
Merge commit 'feebca8ba24c3aedaf667d0db6fb17e36d441328'
* commit 'feebca8ba24c3aedaf667d0db6fb17e36d441328':
Update Monkey to new StrictMode API.
2010-10-01 14:18:42 -07:00
Brad Fitzpatrick
feebca8ba2
am 9c1a73ba: Update Monkey to new StrictMode API.
...
Merge commit '9c1a73ba8a6b6cee05f235ef71975c427a9f3a3c' into gingerbread-plus-aosp
* commit '9c1a73ba8a6b6cee05f235ef71975c427a9f3a3c':
Update Monkey to new StrictMode API.
2010-10-01 13:07:42 -07:00
Nick Kralevich
07505f0214
am 00a7816b: am 11e191b1: Merge "update required permissions." into gingerbread
...
Merge commit '00a7816b2231a0b8154060100671db33f33dc777'
* commit '00a7816b2231a0b8154060100671db33f33dc777':
update required permissions.
2010-10-01 10:52:14 -07:00
Ying Wang
9cf3f0a73e
am 58c636c9: am 45550faa: Merge "Don\'t send non-existent system keys." into gingerbread
...
Merge commit '58c636c9bce624b8cdd33c910d4eb39b856a520d'
* commit '58c636c9bce624b8cdd33c910d4eb39b856a520d':
Don't send non-existent system keys.
2010-10-01 10:52:12 -07:00
Jeff Brown
88603b1881
am 284e1954: resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
...
Merge commit '284e1954274b708f3cf60ab82cdabe0f4c31d141'
* commit '284e1954274b708f3cf60ab82cdabe0f4c31d141':
2010-10-01 10:49:58 -07:00
Nick Kralevich
00a7816b22
am 11e191b1: Merge "update required permissions." into gingerbread
...
Merge commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb' into gingerbread-plus-aosp
* commit '11e191b197c97fe1512f6b630bac9a642eb2ffdb':
update required permissions.
2010-10-01 10:48:35 -07:00
Ying Wang
58c636c9bc
am 45550faa: Merge "Don\'t send non-existent system keys." into gingerbread
...
Merge commit '45550faad0f683d1393ea20144246ed43fc19899' into gingerbread-plus-aosp
* commit '45550faad0f683d1393ea20144246ed43fc19899':
Don't send non-existent system keys.
2010-10-01 10:48:30 -07:00
Brad Fitzpatrick
9c1a73ba8a
Update Monkey to new StrictMode API.
...
Change-Id: I0f2e90496c4dece8ee3766170d8a1fe2d22a7ff4
2010-10-01 10:48:01 -07:00
Jeff Brown
284e195427
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
...
Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137
2010-10-01 10:42:11 -07:00
Nick Kralevich
11e191b197
Merge "update required permissions." into gingerbread
2010-10-01 09:44:27 -07:00
Ying Wang
45550faad0
Merge "Don't send non-existent system keys." into gingerbread
2010-10-01 09:42:13 -07:00
Nick Kralevich
4d68d883a5
update required permissions.
...
Change-Id: I49fb855c62aa1a11c8cbf7645aa4dbe2fa18faf3
2010-10-01 09:34:19 -07:00
Nick Kralevich
ecf11ceb60
am 6a10d397: am c70ceb23: initial checkin. Needs lots of love.
...
Merge commit '6a10d397f311f7816d29e9879eb1c020b8863821'
* commit '6a10d397f311f7816d29e9879eb1c020b8863821':
2010-09-30 18:11:32 -07:00
Jeff Brown
cc633e4965
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp
...
Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b
2010-09-30 16:39:16 -07:00
Xavier Ducrohet
77fdd16cf3
am 3975280e: (-s ours) am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE
...
Merge commit '3975280e0583d45de4708375622b22019a0df9f5'
* commit '3975280e0583d45de4708375622b22019a0df9f5':
Integrate sdk.atree changes from master. DO NOT MERGE
2010-09-30 16:00:51 -07:00
Jeff Brown
4110368b93
Merge "Improve touch paint sample to use geometrical touch width." into gingerbread
2010-09-30 15:58:59 -07:00
Jeff Brown
fc1ee06369
Improve touch paint sample to use geometrical touch width.
...
Added multitouch support.
Fixed the trackball based drawing.
Change-Id: I15d9c5c4ac26a83f476f98c1f2ef3a5841e2ffbd
2010-09-30 15:32:28 -07:00
Nick Kralevich
6a10d397f3
am c70ceb23: initial checkin. Needs lots of love.
...
Merge commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91' into gingerbread-plus-aosp
* commit 'c70ceb2363a444680aa17c8dcefbf8075e83cc91':
initial checkin. Needs lots of love.
2010-09-30 15:21:49 -07:00
Nick Kralevich
c70ceb2363
initial checkin. Needs lots of love.
...
Change-Id: I126e355af94915d60d7a97bc3bee84e0a2ad61d4
2010-09-30 15:16:58 -07:00
Xavier Ducrohet
3975280e05
am 76afc004: Integrate sdk.atree changes from master. DO NOT MERGE
...
Merge commit '76afc004df452384cfd00137a59c7a3e0502ff75' into gingerbread-plus-aosp
* commit '76afc004df452384cfd00137a59c7a3e0502ff75':
Integrate sdk.atree changes from master. DO NOT MERGE
2010-09-30 13:20:12 -07:00
Jeff Brown
b39c4ba316
Added samples for splitting touches across views.
...
Also modified the rotating button demo to use touch splitting.
Change-Id: I560736903651e6846f847a9bd743a24a1707f6d2
2010-09-30 11:56:14 -07:00
Xavier Ducrohet
76afc004df
Integrate sdk.atree changes from master. DO NOT MERGE
...
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree
Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
2010-09-30 11:33:21 -07:00
Kenny Root
4e64cbb031
am e575be05: am 12c86756: Merge "Add OBB usage example" into gingerbread
...
Merge commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4'
* commit 'e575be05fd15d0858e4e0655ba3e1d6ecacf26d4':
Add OBB usage example
2010-09-30 11:29:05 -07:00
Xavier Ducrohet
87bfd07634
am 92d47e4e: am 682ec293: Split the tools component from sdk.atree
...
Merge commit '92d47e4ef65c225bcf82c81377412d5c67349ff5'
* commit '92d47e4ef65c225bcf82c81377412d5c67349ff5':
Split the tools component from sdk.atree
2010-09-30 11:27:02 -07:00
Eric Fischer
b4ad0ca975
am 2ec45a5e: am f4578730: Genericize strings with SD card references.
...
Merge commit '2ec45a5e5a56508d81d54b1e3fa35ac9d118708c'
* commit '2ec45a5e5a56508d81d54b1e3fa35ac9d118708c':
Genericize strings with SD card references.
2010-09-30 11:25:00 -07:00
Kenny Root
e575be05fd
am 12c86756: Merge "Add OBB usage example" into gingerbread
...
Merge commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d' into gingerbread-plus-aosp
* commit '12c86756b9c1ac9080e7ff052a78cdcf16b8f85d':
Add OBB usage example
2010-09-30 10:09:11 -07:00
Xavier Ducrohet
92d47e4ef6
am 682ec293: Split the tools component from sdk.atree
...
Merge commit '682ec293359cf4ac8c61df25bb05519b604b17eb' into gingerbread-plus-aosp
* commit '682ec293359cf4ac8c61df25bb05519b604b17eb':
Split the tools component from sdk.atree
2010-09-30 08:52:23 -07:00
Kenny Root
12c86756b9
Merge "Add OBB usage example" into gingerbread
2010-09-29 17:19:14 -07:00
Kenny Root
b9e80e74e2
Add OBB usage example
...
Change-Id: I7da5ac0009cb32829e7c6470c0a60ebff2988905
2010-09-29 16:18:08 -07:00
Ying Wang
5ee69f6f2c
Don't send non-existent system keys.
...
Send only if the system key physically exists.
Change-Id: I8fa102db679c55e5bfba1c9a68ecf2bc196021cd
2010-09-29 13:23:56 -07:00
Eric Fischer
2ec45a5e5a
am f4578730: Genericize strings with SD card references.
...
Merge commit 'f4578730bf95574f417fc2cee979bdc980cd02a8' into gingerbread-plus-aosp
* commit 'f4578730bf95574f417fc2cee979bdc980cd02a8':
Genericize strings with SD card references.
2010-09-29 12:49:20 -07:00
Eric Fischer
f4578730bf
Genericize strings with SD card references.
...
Change-Id: Ife7f7178b7ba11650bb81a6afc61e70e4b8a7b4f
2010-09-29 10:56:20 -07:00
Joe Malin
f82564473f
Samples: Fix bugs in Note Pad sample app.
...
Change-Id: Iacb22efa30d3627dba5a5f91151da5c75722715e
2010-09-28 16:02:00 -07:00
Xavier Ducrohet
682ec29335
Split the tools component from sdk.atree
...
This is now in sdk/build/tools.atree.
Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
6f1718bab5
am daa454cb: am 64e53fe5: Merge "Move adb to the platform-tools."
...
Merge commit 'daa454cb3ba51dcf75330955dc899d35a7b60989'
* commit 'daa454cb3ba51dcf75330955dc899d35a7b60989':
Move adb to the platform-tools.
2010-09-27 21:29:10 -07:00
Raphael Moll
745a9108d0
am c0a2e0fc: am 2f613967: Move adb to the platform-tools (windows SDK part).
...
Merge commit 'c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5'
* commit 'c0a2e0fc63fe94c336b44b40cf69fa70a8151cb5':
Move adb to the platform-tools (windows SDK part).
2010-09-27 21:29:06 -07:00
Xavier Ducrohet
daa454cb3b
am 64e53fe5: Merge "Move adb to the platform-tools."
...
Merge commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b' into gingerbread-plus-aosp
* commit '64e53fe5dd1d884eabe5e6160d69afa47038d77b':
Move adb to the platform-tools.
2010-09-27 16:44:55 -07:00
Raphael Moll
c0a2e0fc63
am 2f613967: Move adb to the platform-tools (windows SDK part).
...
Merge commit '2f613967a0c4a579370ff498c8461abee4978fc7' into gingerbread-plus-aosp
* commit '2f613967a0c4a579370ff498c8461abee4978fc7':
Move adb to the platform-tools (windows SDK part).
2010-09-27 16:44:40 -07:00
Xavier Ducrohet
64e53fe5dd
Merge "Move adb to the platform-tools."
2010-09-27 16:24:25 -07:00
Raphael Moll
2f613967a0
Move adb to the platform-tools (windows SDK part).
...
This is the Win SDK counterpart to Change I4c2a11c1.
Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
6a8e50f695
Move adb to the platform-tools.
...
Also fixed the packaging of hierarchyViewer in the SDK
Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00
Jean-Baptiste Queru
3f666d8754
am 29fd635b: am 7159b406: reconcile froyo-release into gingerbread
...
Merge commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a'
* commit '29fd635bfd4fd1bac8cabd1aeafe9d72486b0b5a':
Explicitly enable backup by default in SDK builds
2010-09-26 17:51:21 -07:00
Jean-Baptiste Queru
29fd635bfd
am 7159b406: reconcile froyo-release into gingerbread
...
Merge commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1' into gingerbread-plus-aosp
* commit '7159b406efb7533f022cbe0bd2d855eb6a52cfe1':
Explicitly enable backup by default in SDK builds
2010-09-26 17:39:26 -07:00
Jean-Baptiste Queru
7159b406ef
reconcile froyo-release into gingerbread
...
Change-Id: I0cd475594cd7697ee681bfc7eb76d61bec236417
2010-09-26 17:28:54 -07:00
David 'Digit' Turner
2ffaf68b6b
am fe13c761: am be572466: Merge "Update prebuilt library test." into gingerbread
...
Merge commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e'
* commit 'fe13c7616dd1be754b9cbc0c09d8f0e71af69a1e':
Update prebuilt library test.
2010-09-24 01:17:41 -07:00