Commit Graph

5283 Commits

Author SHA1 Message Date
Nick Kralevich
85122d2605 add some new mock ndef messages for testing.
Change-Id: Ib238bc427c7350cec4b6765a171d6f3fa0907151
2010-10-14 13:28:28 -07:00
Chet Haase
e358b47be5 Updating code to use new non-generified animator APIs
Change-Id: I3023db9d1f9cb8bf98b788fce4ae2b58b182987d
2010-10-14 13:13:07 -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
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
Brett Chabot
2b03173b27 am 5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread
Merge commit '5b599c31481633e4f4277a125eeae6ea47600b02' into gingerbread-plus-aosp

* commit '5b599c31481633e4f4277a125eeae6ea47600b02':
  Add utility for toggling settings from the cmd line.
2010-10-14 12:03:27 -07:00
Xavier Ducrohet
dd3b6a8034 am 99b80ab4: Merge "GB SDK: don\'t use HV2.bat when generating tools." into gingerbread
Merge commit '99b80ab47970eee84d014d3719b2b9674dc6904b' into gingerbread-plus-aosp

* commit '99b80ab47970eee84d014d3719b2b9674dc6904b':
  GB SDK: don't use HV2.bat when generating tools.
2010-10-14 12:03:25 -07:00
Gilles Debunne
88be7a527d am 03751547: Assets moved to hdpi directory, mdpi version created
Merge commit '037515476560b1277960d0bb781e4be5610558c0' into gingerbread-plus-aosp

* commit '037515476560b1277960d0bb781e4be5610558c0':
  Assets moved to hdpi directory, mdpi version created
2010-10-14 12:01:31 -07: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
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
Xavier Ducrohet
445c0bb83a am e8690246: Merge "Move GB SDK components to 2.3" into gingerbread
Merge commit 'e869024635a4e78c9fc3b3a696623e7cf9d999e0' into gingerbread-plus-aosp

* commit 'e869024635a4e78c9fc3b3a696623e7cf9d999e0':
  Move GB SDK components to 2.3
2010-10-13 17:44:35 -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
0574dc4cfd Dummy java file in native-only apps is not needed anymore.
The tools r8 ant script can handle not having any Java file
at all.

Change-Id: Id14a4a434deb188a5aa1580378fcd1a6445b6e83
2010-10-13 15:34:37 -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
Xavier Ducrohet
6c99a05152 am 9e914e4a: Reorder the samples packaging + readme.
Merge commit '9e914e4aa2075a38d76048261808a9a3a3036eb5' into gingerbread-plus-aosp

* commit '9e914e4aa2075a38d76048261808a9a3a3036eb5':
  Reorder the samples packaging + readme.
2010-10-13 14:22:51 -07:00
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -07:00
Ben Komalo
5bd2e0dbe6 am feb2b3d9: 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.
Merge commit 'feb2b3d9b02d7fd008bea09d14f175d848a62226' into gingerbread-plus-aosp

* commit 'feb2b3d9b02d7fd008bea09d14f175d848a62226':
  Change date storage in DB to be a ms timestamp integral value.
2010-10-13 09:44:04 -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
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
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