Commit Graph

4899 Commits

Author SHA1 Message Date
Chet Haase
e358b47be5 Updating code to use new non-generified animator APIs
Change-Id: I3023db9d1f9cb8bf98b788fce4ae2b58b182987d
2010-10-14 13:13:07 -07:00
Ben Komalo
ec8a83055a am c3fd52ed: am 14ca79d2: Merge "Minor JavaDoc additions and some long line fixes." into gingerbread
Merge commit 'c3fd52ed00409e99fdcb6ac28754e79613410470'

* commit 'c3fd52ed00409e99fdcb6ac28754e79613410470':
  Minor JavaDoc additions and some long line fixes.
2010-10-14 12:14:05 -07:00
Bjorn Bringert
38ee67dc59 Merge "Remove GraphicsLab demo app" 2010-10-14 01:27:31 -07:00
Nick Kralevich
9794d1864d am 23e7a4db: am 5e26d64d: disable proguard. This makes unittests run.
Merge commit '23e7a4db417f0ca364db4cb3b3ddba7bd4f052a8'

* commit '23e7a4db417f0ca364db4cb3b3ddba7bd4f052a8':
  disable proguard.  This makes unittests run.
2010-10-13 23:34:59 -07:00
Anatol Pomazau
bcb7bad611 am 4b96eff4: am 22ba58cf: Merge "Add a util function that converts Text ndef record to text." into gingerbread
Merge commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924'

* commit '4b96eff41cb69579f5e4da861f3821f1fd3a8924':
  Add a util function that converts Text ndef record to text.
2010-10-13 23:34:04 -07:00
Nick Kralevich
3d03832b33 am 9c179113: am e0890ff4: Explain the bytes associated with the NFC type 4 tag.
Merge commit '9c1791134fd822a50a26c4c4164b0b2f5c67988f'

* commit '9c1791134fd822a50a26c4c4164b0b2f5c67988f':
  Explain the bytes associated with the NFC type 4 tag.
2010-10-13 19:15:57 -07:00
Nick Kralevich
3de58af85b am 67007a4a: am 62bb2dcc: change the tab selector icons
Merge commit '67007a4aeb8f6ae80c1d47aa851e2c4cc9ef06e3'

* commit '67007a4aeb8f6ae80c1d47aa851e2c4cc9ef06e3':
  change the tab selector icons
2010-10-13 19:14:39 -07:00
Nick Kralevich
894c83d1f3 am 68c3b4fc: am 21995b18: Add initial support for saved vs non-saved tags.
Merge commit '68c3b4fca69235dd6b526e415fde6d8c0eeae79f'

* commit '68c3b4fca69235dd6b526e415fde6d8c0eeae79f':
  Add initial support for saved vs non-saved tags.
2010-10-13 18:36:39 -07:00
Nick Kralevich
942e978cd7 am abe92c12: am dbb9a2fd: Merge "cleanup unused classes, show date in tag list." into gingerbread
Merge commit 'abe92c127e61ac4775a57d26d60273f58aaf0ceb'

* commit 'abe92c127e61ac4775a57d26d60273f58aaf0ceb':
  cleanup unused classes, show date in tag list.
2010-10-13 18:36:33 -07:00
David 'Digit' Turner
dcce5f5c63 am e68362e1: am 2e9b39e4: Merge "ndk: Add missing OpenSLES headers and libraries." into gingerbread
Merge commit 'e68362e1d65546b17ad0cad2b6598328f40aec57'

* commit 'e68362e1d65546b17ad0cad2b6598328f40aec57':
  ndk: Add missing OpenSLES headers and libraries.
2010-10-13 18:36:19 -07:00
Kenny Root
3ad988d373 am d5e77d5e: am 3ceb9b53: Merge "Update OBB sample to revised API" into gingerbread
Merge commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c'

* commit 'd5e77d5e56aa584e2bf21349f3d11918a15d594c':
  Update OBB sample to revised API
2010-10-13 14:37:34 -07:00
Bjorn Bringert
c3273b8acf Remove GraphicsLab demo app
This demo uses the hidden BoundaryPatch class, which is being
removed.

Change-Id: I050264db6f92267e79d88f2dd31722dcc1d28c01
2010-10-13 17:26:41 +01: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
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
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
David 'Digit' Turner
baeabf2475 am 5a3dbcee: am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread
Merge commit '5a3dbceeb452487ef9328978140c07c4fc596291'

* commit '5a3dbceeb452487ef9328978140c07c4fc596291':
  ndk: Update platform system libraries.
2010-10-10 14:22:14 -07:00
Ying Wang
14c0c1e4a0 am cbe0d5b9: resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Merge commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd'

* commit 'cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd':
  Set monkey process name
2010-10-10 12:49:17 -07:00
Raphael
f838e2f4e1 am 59b02d0e: Update win_sdk to put binaries in SDK/platform-tools.
Merge commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5' into gingerbread-plus-aosp

* commit '59b02d0eff9fb11ea6607a90db3752fe76f250d5':
  Update win_sdk to put binaries in SDK/platform-tools.
2010-10-08 16:23:37 -07:00