Commit Graph

4313 Commits

Author SHA1 Message Date
The Android Automerger
83ab50d658 Merge branch 'gingerbread' into gingerbread-release 2010-10-15 09:06:00 -07:00
Nick Kralevich
ab67f493dc Merge "Have getObjects() return ParsedNdefRecords" into gingerbread 2010-10-14 15:56:24 -07:00
Nick Kralevich
da3b9b7196 Have getObjects() return ParsedNdefRecords
Change-Id: I7e5f8fdf2ae113f55cc5843f517a8a8b20ab00ee
2010-10-14 15:54:39 -07:00
Brett Chabot
4f3dcc857e Revert "Add utility for toggling settings from the cmd line."
This reverts commit a2e81242e0.
2010-10-14 14:15:33 -07:00
Nick Kralevich
85122d2605 add some new mock ndef messages for testing.
Change-Id: Ib238bc427c7350cec4b6765a171d6f3fa0907151
2010-10-14 13:28:28 -07:00
Jeff Hamilton
4f6f93d594 Merge "Checkpoint work on the Tag app." into gingerbread 2010-10-14 12:57:06 -07:00
Jeff Hamilton
928f3aa353 Checkpoint work on the Tag app.
Change-Id: I375aeabe00528d30ce49e8d3d9f78aaac10b0071
2010-10-14 14:52:19 -05:00
Brett Chabot
5b599c3148 Merge "Add utility for toggling settings from the cmd line." into gingerbread 2010-10-14 11:46:18 -07:00
Xavier Ducrohet
99b80ab479 Merge "GB SDK: don't use HV2.bat when generating tools." into gingerbread 2010-10-14 11:42:03 -07:00
Raphael
cca5d187d5 GB SDK: don't use HV2.bat when generating tools.
That's because GB uses the Tools_r& which do not have
hierarchyviewer2 so we should not try to pull the .bat from
hv2. We don't care since we'll ignore these old tools anyway
when packaging the final SDK.

Change-Id: Ie7d161bad59d6e919613db2e854f48964e59c4a9
2010-10-14 11:25:01 -07:00
Gilles Debunne
0375154765 Assets moved to hdpi directory, mdpi version created
Change-Id: I960fa28d2596c26e62cb6914c59c5db2def4a03e
2010-10-14 10:11:57 -07:00
The Android Automerger
37a41dba8e Merge branch 'gingerbread' into gingerbread-release 2010-10-13 18:49:54 -07:00
Xavier Ducrohet
e869024635 Merge "Move GB SDK components to 2.3" into gingerbread 2010-10-13 17:30:07 -07:00
Xavier Ducrohet
4ddc85ac9d Move GB SDK components to 2.3
Change-Id: I1bcd6063d6702f397909d5212b9d0ccb1869f33b
2010-10-13 15:36:48 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00
The Android Automerger
0d541be479 Merge branch 'gingerbread' into gingerbread-release 2010-10-13 07:03:19 -07:00
Ben Komalo
feb2b3d9b0 Change date storage in DB to be a ms timestamp integral value.
Add a basic CursorAdapter to add more flexibility to views in list.
Create custom listview item that is pretty much the same, except
with a relative time string.

Change-Id: I9a1f956832f550b9a8192ea3967e732725dd6ba2
2010-10-12 20:53:08 -07:00
Nick Pelly
a3dc45ac9f Fix build.
Change-Id: I8e950c585ee9d5c97657ac17b00296423b1a8faa
2010-10-12 19:45:24 -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
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
70b631111f add SmartPoster support.
Fix off by 1 in URI handling.

Change-Id: I2007ca20c5411dd3a19aa96ea023652ed293cdc5
2010-10-12 17:26:50 -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
14ca79d2a9 Merge "Minor JavaDoc additions and some long line fixes." into gingerbread 2010-10-12 16:58:58 -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
5e26d64d09 disable proguard. This makes unittests run.
Change-Id: I566bbb83027f55ceb93927cbbb9d4113a1b73c38
2010-10-12 15:16:54 -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
e0890ff4bc Explain the bytes associated with the NFC type 4 tag.
Change-Id: Ibe12a8cb94032f52e02ef28a423203483b1e096f
2010-10-12 13:23:34 -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
The Android Automerger
018c4abc6b Merge branch 'gingerbread' into gingerbread-release 2010-10-12 07:19:18 -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
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
The Android Automerger
6e76fdb7f2 Merge branch 'gingerbread' into gingerbread-release 2010-10-11 07:15:44 -07:00
David 'Digit' Turner
3c72deb3f4 Merge "ndk: remove undefined symbols from system headers" into gingerbread 2010-10-11 06:02:15 -07:00
The Android Automerger
82d4b44da9 Merge branch 'gingerbread' into gingerbread-release 2010-10-10 16:36:31 -07:00
The Android Automerger
b0a6769e58 Merge branch 'gingerbread' into gingerbread-release 2010-10-08 17:14:31 -07:00
Raphael
59b02d0eff Update win_sdk to put binaries in SDK/platform-tools.
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
2010-10-08 15:41:01 -07:00
Jeff Brown
028c403286 Merge "Update NDK with recent changes." into gingerbread 2010-10-08 12:45:05 -07:00
The Android Automerger
f88f7da284 Merge branch 'gingerbread' into gingerbread-release 2010-10-08 09:05:53 -07:00
David 'Digit' Turner
7c2ba504e9 ndk: remove undefined symbols from system headers
This change removes the declaration of functions that are not
implemented by our various versions of our C library.

The corresponding declarations are moved inside #if 0 .. #endif
blocks (so it becomes easy to remember that they are missing)

Also refresh the headers a little (i.e. adding a few missing decl
and macros, remove C++ comments, etc)

See http://code.google.com/p/android/issues/detail?id=7807

Change-Id: I4ae1b1f3a181419eee2004c41b54768cc15e896f
NOTE: The missing decl are still there but encased in #if 0 .. #endif
      blocks (to make it easier to implement them later). There are
      a few exceptions in order to build STLport and libstdc++-v3
      properly.
2010-10-08 17:07:39 +02:00