Commit Graph

260 Commits

Author SHA1 Message Date
Jeff Hamilton
1fecfd93aa am 83e45461: am 15b480d0: Remove the Tag app.
Merge commit '83e45461fd3f6b86823d054663cc3bef5748fd3e'

* commit '83e45461fd3f6b86823d054663cc3bef5748fd3e':
  Remove the Tag app.
2010-10-18 18:11:54 -07:00
Jeff Hamilton
0d8d6a86e1 am e9e97554: am f8580cf6: A bunch of work on the UI.
Merge commit 'e9e97554814733495459e6b441950a342d60f799'

* commit 'e9e97554814733495459e6b441950a342d60f799':
  A bunch of work on the UI.
2010-10-18 16:42:09 -07:00
Nick Pelly
802e17eecd am 79bb3413: am b19cc7ba: Merge "Update permission name for Tag app." into gingerbread
Merge commit '79bb3413318c03e8496d35ee9878e1c6bd6b1dfa'

* commit '79bb3413318c03e8496d35ee9878e1c6bd6b1dfa':
  Update permission name for Tag app.
2010-10-18 16:42:03 -07:00
Jeff Hamilton
83e45461fd am 15b480d0: Remove the Tag app.
Merge commit '15b480d05245b3e2e23e17afce69081eba36574c' into gingerbread-plus-aosp

* commit '15b480d05245b3e2e23e17afce69081eba36574c':
  Remove the Tag app.
2010-10-18 11:26:33 -07:00
Jeff Hamilton
15b480d052 Remove the Tag app.
It's moving to package/apps/Tag.

Change-Id: I1f800fd718b3a06feeeba8fa1564acd3ca173510
2010-10-18 13:14:21 -05:00
Jeff Hamilton
e9e9755481 am f8580cf6: A bunch of work on the UI.
Merge commit 'f8580cf67655e5b4dcf14b2520a8897e97053608' into gingerbread-plus-aosp

* commit 'f8580cf67655e5b4dcf14b2520a8897e97053608':
  A bunch of work on the UI.
2010-10-18 10:26:35 -07:00
Nick Pelly
79bb341331 am b19cc7ba: Merge "Update permission name for Tag app." into gingerbread
Merge commit 'b19cc7baa931fe7af87ab1c6a372bec723a44d75' into gingerbread-plus-aosp

* commit 'b19cc7baa931fe7af87ab1c6a372bec723a44d75':
  Update permission name for Tag app.
2010-10-18 10:26:30 -07:00
Jeff Hamilton
f8580cf676 A bunch of work on the UI.
- Change the tab order and remember the
  current tab
- Proper icon for the starred tab, renamed
  from saved
- Set the proper sort order for the tag lists
- Very rough first pass at full screen tag viewer
- Hookup the delete button in the tag viewer
- Store the snippets for tags in the database
- Added view creation logic to the parsed
  messages and records so they can render
  themselves
- Make the URI records look much better
- For URI records if there are multiple activities
  that can handle the URI build one item per
  activity and bypass the activity chooser
- Pretty print sms[to] and tel URIs
- Hookup URI entries in the viewer to launch the
  activities
- Implement the spec for saving tags and timing
  out the viewer for scanned tags
- Made a few more strings localizable

Change-Id: I6bdb8adf52445499c62a1b046f99d5b119aff068
2010-10-18 12:10:18 -05:00
Nick Pelly
c013897d23 Update permission name for Tag app.
Change-Id: I161aada35095ebe2395eec2e0900ab5c1272bb2b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-17 20:06:52 -07:00
Nick Kralevich
c80e1327ab am c36f835d: am 8149e894: Create a ParsedNdefMessage class with supporting implementations.
Merge commit 'c36f835d598b2b8c653dcbcfa7f157e760737d01'

* commit 'c36f835d598b2b8c653dcbcfa7f157e760737d01':
  Create a ParsedNdefMessage class with supporting implementations.
2010-10-16 09:14:10 -07:00
Nick Kralevich
61263332ff am 4a026a1d: am ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Merge commit '4a026a1d98d5297e4e32f5c95888772d1da09d14'

* commit '4a026a1d98d5297e4e32f5c95888772d1da09d14':
  Have getObjects() return ParsedNdefRecords
2010-10-16 08:58:00 -07:00
Brett Chabot
cb1046b238 am 2cff6ce3: am 4f3dcc85: Revert "Add utility for toggling settings from the cmd line."
Merge commit '2cff6ce39f74ef26a44233fe618b062a783c5f76'

* commit '2cff6ce39f74ef26a44233fe618b062a783c5f76':
  Revert "Add utility for toggling settings from the cmd line."
2010-10-16 08:51:27 -07:00
Nick Kralevich
d1d55e4c6b am 1bc37bf5: am 85122d26: add some new mock ndef messages for testing.
Merge commit '1bc37bf5a5038c85d631750e8ab30457cefa312f'

* commit '1bc37bf5a5038c85d631750e8ab30457cefa312f':
  add some new mock ndef messages for testing.
2010-10-15 16:48:41 -07:00
Jeff Hamilton
98b58077d3 am a46b8b66: am 4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread
Merge commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c'

* commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c':
  Checkpoint work on the Tag app.
2010-10-15 16:48:30 -07:00
Brett Chabot
f591b70a19 am 2b03173b: am 5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread
Merge commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc'

* commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc':
  Add utility for toggling settings from the cmd line.
2010-10-15 14:02:16 -07:00
Gilles Debunne
ddc34941ac am 88be7a52: am 03751547: Assets moved to hdpi directory, mdpi version created
Merge commit '88be7a527d5fdf5ccab00e8c0826c6e06ab844ed'

* commit '88be7a527d5fdf5ccab00e8c0826c6e06ab844ed':
  Assets moved to hdpi directory, mdpi version created
2010-10-15 14:02:07 -07:00
Nick Kralevich
c36f835d59 am 8149e894: Create a ParsedNdefMessage class with supporting implementations.
Merge commit '8149e89466644930069887527143d20cc7c91cfc' into gingerbread-plus-aosp

* commit '8149e89466644930069887527143d20cc7c91cfc':
  Create a ParsedNdefMessage class with supporting implementations.
2010-10-15 09:21:55 -07:00
Nick Kralevich
8149e89466 Create a ParsedNdefMessage class with supporting implementations.
Change-Id: I13a199ad01a726a30e8851a675386c34f2dfa605
2010-10-15 08:48:58 -07:00
Ben Komalo
1e28d189ca am 5bd2e0db: 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 '5bd2e0dbe64c9f3b64edc84900b60691d834cabb'

* commit '5bd2e0dbe64c9f3b64edc84900b60691d834cabb':
  Change date storage in DB to be a ms timestamp integral value.
2010-10-15 00:05:07 -07:00
Nick Pelly
cd9626ae10 am c0121fe8: am a3dc45ac: Fix build.
Merge commit 'c0121fe881699012b056911c309556769dbae495'

* commit 'c0121fe881699012b056911c309556769dbae495':
  Fix build.
2010-10-14 21:19:58 -07:00
Nick Pelly
117b0f5978 am 0a3eafe6: am 1d5707b5: Update Tag app for API changes.
Merge commit '0a3eafe699082f289e03892f234a6a4c45f178c5'

* commit '0a3eafe699082f289e03892f234a6a4c45f178c5':
  Update Tag app for API changes.
2010-10-14 19:30:03 -07:00
Nick Kralevich
4a026a1d98 am ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread
Merge commit 'ab67f493dc44c1dfd6c795abcf61dfec2f233014' into gingerbread-plus-aosp

* commit 'ab67f493dc44c1dfd6c795abcf61dfec2f233014':
  Have getObjects() return ParsedNdefRecords
2010-10-14 16:00:55 -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
Ben Komalo
ce3e391546 am f6193585: 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 'f6193585e35c1d7ba770bcdb009892ead8aa5d8c'

* commit 'f6193585e35c1d7ba770bcdb009892ead8aa5d8c':
  Clean up some resources:
2010-10-14 15:43:58 -07:00
Ben Komalo
f33a114e22 am 9579ecb2: am 6b3b5d22: Ignore vi backup files.
Merge commit '9579ecb28ded271ccb9624c66ab288ea9f685350'

* commit '9579ecb28ded271ccb9624c66ab288ea9f685350':
  Ignore vi backup files.
2010-10-14 15:43:53 -07:00
Nick Kralevich
ddc3e8124a am fe067a16: am 70b63111: add SmartPoster support.
Merge commit 'fe067a169e7d95458bf3bb524ae1522e83d29d4d'

* commit 'fe067a169e7d95458bf3bb524ae1522e83d29d4d':
  add SmartPoster support.
2010-10-14 15:43:48 -07:00
Ben Komalo
19911e33ba am 1d583d99: am 5b2f2912: Nuke author tags and update Manifest that I accidentally left out of the previous CL.
Merge commit '1d583d99cf2cc8eb7bd77492a5823122f3197436'

* commit '1d583d99cf2cc8eb7bd77492a5823122f3197436':
  Nuke author tags and update Manifest that I
2010-10-14 15:28:59 -07:00
Brett Chabot
2cff6ce39f am 4f3dcc85: Revert "Add utility for toggling settings from the cmd line."
Merge commit '4f3dcc857e002d1b5611d0b00bb787eec6318967' into gingerbread-plus-aosp

* commit '4f3dcc857e002d1b5611d0b00bb787eec6318967':
  Revert "Add utility for toggling settings from the cmd line."
2010-10-14 14:57:18 -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
1bc37bf5a5 am 85122d26: add some new mock ndef messages for testing.
Merge commit '85122d2605a22c8e7bcde868c2b7a7d8d744e613' into gingerbread-plus-aosp

* commit '85122d2605a22c8e7bcde868c2b7a7d8d744e613':
  add some new mock ndef messages for testing.
2010-10-14 13:44:50 -07:00
Jeff Hamilton
a46b8b664a am 4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread
Merge commit '4f6f93d594791461d0a1df299800a3b238cdc1fc' into gingerbread-plus-aosp

* commit '4f6f93d594791461d0a1df299800a3b238cdc1fc':
  Checkpoint work on the Tag app.
2010-10-14 13:41:35 -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
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
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
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
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