Commit Graph

5103 Commits

Author SHA1 Message Date
Nick Pelly
c0121fe881 am a3dc45ac: Fix build.
Merge commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117' into gingerbread-plus-aosp

* commit 'a3dc45ac9f4c7e1bfa8a5084add450ab0712f117':
  Fix build.
2010-10-12 19:48:38 -07:00
Nick Pelly
a3dc45ac9f Fix build.
Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa
2010-10-12 19:45:24 -07:00
Nick Pelly
0a3eafe699 am 1d5707b5: Update Tag app for API changes.
Merge commit '1d5707b5a864f5f154bc2de98f7c2027b8390387' into gingerbread-plus-aosp

* commit '1d5707b5a864f5f154bc2de98f7c2027b8390387':
  Update Tag app for API changes.
2010-10-12 19:04:21 -07:00
Nick Pelly
1d5707b5a8 Update Tag app for API changes.
Change-Id: Idecfee21ee58f7a19d5dcbae39c231b8e8d96095
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12 19:00:14 -07:00
Ben Komalo
f6193585e3 am 5fed2354: Merge "Clean up some resources: - remove duplicated desk clocks since they were really the same icon. - shrink down the tab indicator icons to a suitable size - remove title bar from activity" into gingerbread
Merge commit '5fed2354d2ffb374ea84641eed0fe287fb26c3ce' into gingerbread-plus-aosp

* commit '5fed2354d2ffb374ea84641eed0fe287fb26c3ce':
  Clean up some resources:
2010-10-12 18:37:12 -07:00
Ben Komalo
9579ecb28d am 6b3b5d22: Ignore vi backup files.
Merge commit '6b3b5d22a377413a05ec274accd28ac0998fc420' into gingerbread-plus-aosp

* commit '6b3b5d22a377413a05ec274accd28ac0998fc420':
  Ignore vi backup files.
2010-10-12 18:37:11 -07:00
Ben Komalo
5fed2354d2 Merge "Clean up some resources: - remove duplicated desk clocks since they were really the same icon. - shrink down the tab indicator icons to a suitable size - remove title bar from activity" into gingerbread 2010-10-12 18:34:50 -07:00
Ben Komalo
6b3b5d22a3 Ignore vi backup files.
Change-Id: Ibeb80d1fee84be1cf33321eec0284a0306513646
2010-10-12 18:27:14 -07:00
Ben Komalo
558defa492 Clean up some resources:
- remove duplicated desk clocks since they were really the same icon.
- shrink down the tab indicator icons to a suitable size
- remove title bar from activity

Change-Id: I39ed7efb0e493a7ac037d6c06fa25eeb53d2332e
2010-10-12 18:26:41 -07:00
Nick Kralevich
fe067a169e am 70b63111: add SmartPoster support.
Merge commit '70b631111f606bac7daeac1af65aa1884007eaa0' into gingerbread-plus-aosp

* commit '70b631111f606bac7daeac1af65aa1884007eaa0':
  add SmartPoster support.
2010-10-12 18:17:09 -07:00
Nick Kralevich
70b631111f add SmartPoster support.
Fix off by 1 in URI handling.

Change-Id: I2007ca20c5411dd3a19aa96ea023652ed293cdc5
2010-10-12 17:26:50 -07:00
Ben Komalo
1d583d99cf am 5b2f2912: Nuke author tags and update Manifest that I accidentally left out of the previous CL.
Merge commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848' into gingerbread-plus-aosp

* commit '5b2f2912bcf4c1a9da9e8120d2788e31b484a848':
  Nuke author tags and update Manifest that I
2010-10-12 17:16:24 -07:00
Ben Komalo
5b2f2912bc Nuke author tags and update Manifest that I
accidentally left out of the previous CL.

Change-Id: I0e7eb27b6e79cf5df62f901ed68225eed986fca2
2010-10-12 17:05:33 -07:00
Ben Komalo
c3fd52ed00 am 14ca79d2: Merge "Minor JavaDoc additions and some long line fixes." into gingerbread
Merge commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab' into gingerbread-plus-aosp

* commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab':
  Minor JavaDoc additions and some long line fixes.
2010-10-12 17:00:57 -07:00
Ben Komalo
14ca79d2a9 Merge "Minor JavaDoc additions and some long line fixes." into gingerbread 2010-10-12 16:58:58 -07:00
Nick Kralevich
686c76d382 am 045e0767: am 4a74a386: get rid of sql finalizer error messages.
Merge commit '045e0767be2acb552ce2b6f0c44a0bfa2333ed97'

* commit '045e0767be2acb552ce2b6f0c44a0bfa2333ed97':
  get rid of sql finalizer error messages.
2010-10-12 16:39:27 -07:00
Nick Kralevich
b26b52bda7 am 3cd15309: am 55fe78df: bytes should be a blob.
Merge commit '3cd1530903979d818a57f28e003fb15cc51f33e2'

* commit '3cd1530903979d818a57f28e003fb15cc51f33e2':
  bytes should be a blob.
2010-10-12 16:39:15 -07:00
Ben Komalo
bd74a29eb5 Minor JavaDoc additions and some long line fixes.
Change-Id: Ia416b8b7536eb6c4aec4a41dea45de5669f37155
2010-10-12 16:35:43 -07:00
Nick Kralevich
23e7a4db41 am 5e26d64d: disable proguard. This makes unittests run.
Merge commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c' into gingerbread-plus-aosp

* commit '5e26d64d0907e403baf3c487191a4c5ffb48f74c':
  disable proguard.  This makes unittests run.
2010-10-12 15:23:11 -07:00
Nick Kralevich
5e26d64d09 disable proguard. This makes unittests run.
Change-Id: I566bbb83027f55ceb93927cbbb9d4113a1b73c38
2010-10-12 15:16:54 -07:00
Anatol Pomazau
4b96eff41c am 22ba58cf: Merge "Add a util function that converts Text ndef record to text." into gingerbread
Merge commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1' into gingerbread-plus-aosp

* commit '22ba58cfb88e1394b34dc40b83f3dbf5229b2fb1':
  Add a util function that converts Text ndef record to text.
2010-10-12 14:38:44 -07:00
Anatol Pomazau
22ba58cfb8 Merge "Add a util function that converts Text ndef record to text." into gingerbread 2010-10-12 14:36:09 -07:00
Anatol Pomazau
103f9c2257 Add a util function that converts Text ndef record to text.
Add a unit test for it.

Change-Id: I5ce2020669150e3768a19354e951b6a54cc550d4
2010-10-12 14:33:58 -07:00
Nick Kralevich
9c1791134f am e0890ff4: Explain the bytes associated with the NFC type 4 tag.
Merge commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7' into gingerbread-plus-aosp

* commit 'e0890ff4bc95c63104a00df66f69b0ccd7ed15d7':
  Explain the bytes associated with the NFC type 4 tag.
2010-10-12 14:02:31 -07:00
Nick Kralevich
e0890ff4bc Explain the bytes associated with the NFC type 4 tag.
Change-Id: Ibe12a8cb94032f52e02ef28a423203483b1e096f
2010-10-12 13:23:34 -07:00
Nick Kralevich
67007a4aeb am 62bb2dcc: change the tab selector icons
Merge commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a' into gingerbread-plus-aosp

* commit '62bb2dccdd9dcf223908c728e24460e8248a9e7a':
  change the tab selector icons
2010-10-12 11:33:33 -07:00
Nick Kralevich
68c3b4fca6 am 21995b18: Add initial support for saved vs non-saved tags.
Merge commit '21995b188899d9576ef8c5d26f0cc9e373804204' into gingerbread-plus-aosp

* commit '21995b188899d9576ef8c5d26f0cc9e373804204':
  Add initial support for saved vs non-saved tags.
2010-10-12 11:23:49 -07:00
Nick Kralevich
abe92c127e am dbb9a2fd: Merge "cleanup unused classes, show date in tag list." into gingerbread
Merge commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee' into gingerbread-plus-aosp

* commit 'dbb9a2fd92cf5f5adedb6b748ddd75e621c023ee':
  cleanup unused classes, show date in tag list.
2010-10-12 11:23:27 -07:00
David 'Digit' Turner
e68362e1d6 am 2e9b39e4: Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread
Merge commit '2e9b39e457f1cf6794356144cad250c7fbe4e868' into gingerbread-plus-aosp

* commit '2e9b39e457f1cf6794356144cad250c7fbe4e868':
  ndk: Add missing OpenSLES headers and libraries.
2010-10-12 11:23:21 -07:00
Nick Kralevich
62bb2dccdd change the tab selector icons
Change-Id: Ia12adb2e72d6b8d444fd179970ed4b27a9fa3976
2010-10-12 11:12:59 -07:00
Nick Kralevich
21995b1888 Add initial support for saved vs non-saved tags.
Get rid of the third "MyTag" column.  This isn't currently
being used.

Change-Id: Id35074d939e1373f0998e5502eb9cfc9c86ecca5
2010-10-12 11:06:22 -07:00
Nick Kralevich
dbb9a2fd92 Merge "cleanup unused classes, show date in tag list." into gingerbread 2010-10-12 11:01:05 -07:00
David 'Digit' Turner
2e9b39e457 Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread 2010-10-12 10:31:53 -07:00
David 'Digit' Turner
51bcfb7110 ndk: Add missing OpenSLES headers and libraries.
Change-Id: I5444f8701a2b8ad8e99fffc6906bad1bf101530f
2010-10-12 18:29:00 +02:00
David 'Digit' Turner
47cacaf625 am b53e3cac: am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread
Merge commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d'

* commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d':
  ndk: remove undefined symbols from system headers
2010-10-11 18:59:22 -07:00
Kenny Root
d5e77d5e56 am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread
Merge commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd' into gingerbread-plus-aosp

* commit '3ceb9b53eab86a86d1817d344822bd16fbbc47fd':
  Update OBB sample to revised API
2010-10-11 17:31:13 -07:00
Nick Kralevich
8b2b6a1730 cleanup unused classes, show date in tag list.
Change-Id: Ie9b1eee3606d7d1cfaff73723ff40c7570a6b1c9
2010-10-11 17:28:21 -07:00
Kenny Root
3ceb9b53ea Merge "Update OBB sample to revised API" into gingerbread 2010-10-11 17:28:20 -07:00
Nick Kralevich
045e0767be am 4a74a386: get rid of sql finalizer error messages.
Merge commit '4a74a386066d2eb86b64ffdf09391def0451e4be' into gingerbread-plus-aosp

* commit '4a74a386066d2eb86b64ffdf09391def0451e4be':
  get rid of sql finalizer error messages.
2010-10-11 17:26:33 -07:00
Nick Kralevich
3cd1530903 am 55fe78df: bytes should be a blob.
Merge commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58' into gingerbread-plus-aosp

* commit '55fe78df445c72e2eebf1e07a704432b8b2c2f58':
  bytes should be a blob.
2010-10-11 17:25:55 -07:00
Kenny Root
a2f69539af Update OBB sample to revised API
Change-Id: Idc724170a9cbb6a94523b406b8a1f91fcf8293a4
2010-10-11 17:25:23 -07:00
Brett Chabot
a2e81242e0 Add utility for toggling settings from the cmd line.
Change-Id: I4dc7052c22fac3edf66e2d7db0c8d7039be4f196
2010-10-11 16:25:03 -07:00
Nick Kralevich
4a74a38606 get rid of sql finalizer error messages.
Change-Id: I5613734b78f861237b435079742528b9623c97de
2010-10-11 16:10:04 -07:00
Nick Kralevich
55fe78df44 bytes should be a blob.
Change-Id: I8bbf6aab8ec67d60cb6ac47cd273aec8814d2d6a
2010-10-11 15:22:58 -07:00
Joe Malin
390d67679c Samples: Fix bugs in Note Pad sample app.
Change-Id: I859cbc73eaaa77a9ff89484f33c7150d76a4e2c2
2010-10-11 09:13:32 -07:00
David 'Digit' Turner
b53e3cac40 am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread
Merge commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3' into gingerbread-plus-aosp

* commit '3c72deb3f4f087a3f7b8915301277b9e26b286e3':
  ndk: remove undefined symbols from system headers
2010-10-11 06:11:48 -07:00
David 'Digit' Turner
3c72deb3f4 Merge "ndk: remove undefined symbols from system headers" into gingerbread 2010-10-11 06:02:15 -07:00
Raphael
3fe7e69b2d am f838e2f4: am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4'

* commit 'f838e2f4e1d18b9a24fd9e6d524ce4c87e38fde4':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-10-10 19:14:18 -07:00
Jean-Baptiste Queru
a4d6fb3907 am 4ceead6b: am e73f0dfc: Merge "Added adb_interface.WaitForProcess and WaitForProcessEnd."
Merge commit '4ceead6ba01a938499726809c90154cb0e8c1e22'

* commit '4ceead6ba01a938499726809c90154cb0e8c1e22':
  Added adb_interface.WaitForProcess and WaitForProcessEnd.
2010-10-10 17:46:49 -07:00
Jeff Brown
2559781424 am 7afd3a56: am 028c4032: Merge "Update NDK with recent changes." into gingerbread
Merge commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2'

* commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2':
  Update NDK with recent changes.
2010-10-10 17:45:41 -07:00