8 years agoam 52d880da: Really fix the build.
Jeff Hamilton [Thu, 4 Nov 2010 03:11:41 +0000]
am 52d880da: Really fix the build.

* commit '52d880daa43a4f587107a6b8a0197afd3092200a':
  Really fix the build.

8 years agoam e2f5675c: Fix the build
Jeff Hamilton [Thu, 4 Nov 2010 03:11:32 +0000]
am e2f5675c: Fix the build

* commit 'e2f5675cc5bd371e1afdd36463d743123d4e4154':
  Fix the build

8 years agoam 84ac53ee: Merge "Make the list item one line." into gingerbread
Jason parks [Thu, 4 Nov 2010 03:11:11 +0000]
am 84ac53ee: Merge "Make the list item one line." into gingerbread

* commit '84ac53ee098ac05db366f927d205bd011f20368c':
  Make the list item one line.

8 years agoresolved conflicts for merge of fd860fde to master
Jason Chen [Thu, 4 Nov 2010 02:58:45 +0000]
resolved conflicts for merge of fd860fde to master

Change-Id: Ib2d933ce3edfa1b5e6cd57c1c1ea244eedb6e572

8 years agoReally fix the build.
Jeff Hamilton [Wed, 3 Nov 2010 21:09:42 +0000]
Really fix the build.

Change-Id: I94da628bfb25ac2fd4de2ee39df0c91f6cdd6e97

8 years agoFix the build
Jeff Hamilton [Wed, 3 Nov 2010 20:42:59 +0000]
Fix the build

Change-Id: I686e55e8148c7774d1d5be2ab0891b9108d8fa2b

8 years agoMerge "Make the list item one line." into gingerbread
Jason parks [Wed, 3 Nov 2010 20:29:01 +0000]
Merge "Make the list item one line." into gingerbread

8 years agoMake the list item one line.
Jason parks [Wed, 3 Nov 2010 20:28:32 +0000]
Make the list item one line.

Change-Id: I300d4807afd57b78a527925b27ce2b2f737cd6dd

8 years agoRemove the My Tag feature.
Jeff Hamilton [Wed, 3 Nov 2010 20:14:46 +0000]
Remove the My Tag feature.

Change-Id: I4488dcb66fc43c8fd67e39276fb866eb08ebc2f2

8 years agoam 06ccd61b: Don\'t crash if the photo list is null.
Jeff Hamilton [Wed, 3 Nov 2010 19:11:49 +0000]
am 06ccd61b: Don\'t crash if the photo list is null.

* commit '06ccd61bc27a302604c571f2b772bb440adc3ddc':
  Don't crash if the photo list is null.

8 years agoDon't crash if the photo list is null.
Jeff Hamilton [Wed, 3 Nov 2010 19:02:51 +0000]
Don't crash if the photo list is null.

Change-Id: I35f85c37fa0f28c9b7531e5d64932d6044fb33ea

8 years agoam cea07d0d: Use STREAM_NOTIFICATION for tag scanned beeps.
Jeff Hamilton [Wed, 3 Nov 2010 19:02:55 +0000]
am cea07d0d: Use STREAM_NOTIFICATION for tag scanned beeps.

* commit 'cea07d0d7a82a3e2dc93c7a8e71d10546e72250d':
  Use STREAM_NOTIFICATION for tag scanned beeps.

8 years agoam 8e2c2b32: (-s ours) DO NOT MERGE revert to simple My Tag UI.
Jeff Hamilton [Wed, 3 Nov 2010 19:02:26 +0000]
am 8e2c2b32: (-s ours) DO NOT MERGE revert to simple My Tag UI.

* commit '8e2c2b329fe523d782df6cd313b78c9d11f90cc3':
  DO NOT MERGE revert to simple My Tag UI.

8 years agoam f38cc726: Fix NPE when receiving a NDEF message of 0 length.
Jason parks [Wed, 3 Nov 2010 19:02:19 +0000]
am f38cc726: Fix NPE when receiving a NDEF message of 0 length.

* commit 'f38cc72626f196d664607011b3a66a6e07379929':
  Fix NPE when receiving a NDEF message of 0 length.

8 years agoam a69d8237: Merge "My tag list restructuring." into gingerbread
Jason Parks [Wed, 3 Nov 2010 18:43:00 +0000]
am a69d8237: Merge "My tag list restructuring." into gingerbread

* commit 'a69d82371c36b62fefe5f837fa78e58dd5b21e63':
  My tag list restructuring.

8 years agoam 0c4c3a3e: Merge "Kill MyTagActivity and merge it into EditTagActivity. (making...
Jason Parks [Wed, 3 Nov 2010 18:42:57 +0000]
am 0c4c3a3e: Merge "Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)" into gingerbread

* commit '0c4c3a3e9db3cea445937fbe739df2334a143240':
  Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)

8 years agoam 07b51eed: For unknown tags display the unknown message.
Jason parks [Wed, 3 Nov 2010 17:59:15 +0000]
am 07b51eed: For unknown tags display the unknown message.

* commit '07b51eedea198c6aca4f378120d5edfdfb2e4cf5':
  For unknown tags display the unknown message.

8 years agoam c2bab52a: Keep the screen on a little longer after scanning a tag.
Jason parks [Wed, 3 Nov 2010 17:58:41 +0000]
am c2bab52a: Keep the screen on a little longer after scanning a tag.

* commit 'c2bab52a78004bc5f4e952f4c6a2d35bd59242ba':
  Keep the screen on a little longer after scanning a tag.

8 years agoam 383e6d11: Grab a wake lock when you scan a tag.
Jeff Hamilton [Wed, 3 Nov 2010 17:58:38 +0000]
am 383e6d11: Grab a wake lock when you scan a tag.

* commit '383e6d1118bc04b2ccedd3276f04e09ef1c8d3ff':
  Grab a wake lock when you scan a tag.

8 years agoUse STREAM_NOTIFICATION for tag scanned beeps.
Jeff Hamilton [Wed, 3 Nov 2010 15:58:21 +0000]
Use STREAM_NOTIFICATION for tag scanned beeps.

Change-Id: Ia8399a7b5a280c8dcfd55abaa25cbabd0bb93e27

8 years agoDO NOT MERGE revert to simple My Tag UI.
Jeff Hamilton [Wed, 3 Nov 2010 15:38:38 +0000]
DO NOT MERGE revert to simple My Tag UI.

Revert "Merge "My tag list restructuring." into gingerbread"

This reverts commit a69d82371c36b62fefe5f837fa78e58dd5b21e63, reversing
changes made to 0c4c3a3e9db3cea445937fbe739df2334a143240.

Revert "Merge "Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)" into gingerbread"

This reverts commit 0c4c3a3e9db3cea445937fbe739df2334a143240, reversing
changes made to 07b51eedea198c6aca4f378120d5edfdfb2e4cf5.

8 years agoFix NPE when receiving a NDEF message of 0 length.
Jason parks [Wed, 3 Nov 2010 03:50:09 +0000]
Fix NPE when receiving a NDEF message of 0 length.

Change-Id: I44661f453f7819b7847bb892f868cb05bdd66aaa

8 years agoMerge "My tag list restructuring." into gingerbread
Jason Parks [Wed, 3 Nov 2010 02:51:21 +0000]
Merge "My tag list restructuring." into gingerbread

8 years agoMerge "Kill MyTagActivity and merge it into EditTagActivity. (making way for a new...
Jason Parks [Wed, 3 Nov 2010 02:50:06 +0000]
Merge "Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)" into gingerbread

8 years agoMy tag list restructuring.
Ben Komalo [Tue, 2 Nov 2010 00:09:55 +0000]
My tag list restructuring.

This introduces a new MyTagList which manages a list of tags that
can be set as the active "My tag" for the device. This list is
completely independent of the scanned tags list.

Change-Id: I1b6572779cf75f1d76bb209a970fa5dfb6b38e96

8 years agoFor unknown tags display the unknown message.
Jason parks [Tue, 2 Nov 2010 20:28:29 +0000]
For unknown tags display the unknown message.

Change-Id: I87e3b596f65951a028623e8008e1048f4c1aa631

8 years agoKill MyTagActivity and merge it into EditTagActivity.
Ben Komalo [Mon, 1 Nov 2010 22:58:35 +0000]
Kill MyTagActivity and merge it into EditTagActivity.
(making way for a new MyTagActivity that is the list and
 manager for MyTag)

Change-Id: I86a6580b7210549eb6fc60c00daf0aa6ea6e6bdc

8 years agoKeep the screen on a little longer after scanning a tag.
Jason parks [Tue, 2 Nov 2010 18:33:01 +0000]
Keep the screen on a little longer after scanning a tag.

Added a wakelock with a timeout to keep the screen
on. Added a broadcast receiver for screen off to
finish the tag scanning activity. This will prevent
the activity from showing up the next time the
screen on.

8 years agoGrab a wake lock when you scan a tag.
Jeff Hamilton [Fri, 29 Oct 2010 21:21:55 +0000]
Grab a wake lock when you scan a tag.

This prevents the screen from immediately going
to sleep when the TagViewer is hiding the lock
screen.

The wake lock is acquired with a timeout to ensure
it doesn't keep the device awake forever.

Bug: 3146598
Change-Id: Ib97b42cba3ad7ded1cb165769a35c36d922e4cd0

8 years agoam 3ed6860e: Simple change to add the ability to share a contact via My tag.
Ben Komalo [Tue, 2 Nov 2010 01:31:28 +0000]
am 3ed6860e: Simple change to add the ability to share a contact via My tag.

* commit '3ed6860e0816fc00b37a6845d3c8afbfd79ac40b':
  Simple change to add the ability to share a contact via My tag.

8 years agoSimple change to add the ability to share a contact via
Ben Komalo [Thu, 28 Oct 2010 01:00:14 +0000]
Simple change to add the ability to share a contact via
My tag.

Change-Id: Ic084263350e66aca99eecf2b5edf1e26bbda1904

8 years agoam 9299bbc8: Show toast when tag is deleted.
Ben Komalo [Mon, 1 Nov 2010 21:16:38 +0000]
am 9299bbc8: Show toast when tag is deleted.

* commit '9299bbc8f5b2b26b4684f832f0360779ea5c5d77':
  Show toast when tag is deleted.

8 years agoam 81e7cece: Minor cleanup work - merge title/text in My tag and don\'t show the...
Ben Komalo [Mon, 1 Nov 2010 21:16:36 +0000]
am 81e7cece: Minor cleanup work - merge title/text in My tag and don\'t show the date on newly collected tag popups

* commit '81e7cece03b7dc5fd926f860495d068a32856e77':
  Minor cleanup work - merge title/text in My tag and don't show the date on newly collected tag popups

8 years agoam 8e76ce30: Create a one-time, first-run about activity that introduces the concept...
Ben Komalo [Mon, 1 Nov 2010 20:50:53 +0000]
am 8e76ce30: Create a one-time, first-run about activity that introduces the concept of NFC and tags.

* commit '8e76ce303262fd887181e5d67180e3061c94b26e':
  Create a one-time, first-run about activity that introduces the concept of NFC and tags.

8 years agoShow toast when tag is deleted.
Ben Komalo [Mon, 1 Nov 2010 20:45:40 +0000]
Show toast when tag is deleted.

Change-Id: I45914e2701dd646be205ba540c4fb9dce35d1e46

8 years agoMinor cleanup work - merge title/text in My tag and don't show
Ben Komalo [Mon, 1 Nov 2010 20:42:23 +0000]
Minor cleanup work - merge title/text in My tag and don't show
the date on newly collected tag popups

Change-Id: I5222ba61c02894370750295f559312979c152dda

8 years agoCreate a one-time, first-run about activity that
Ben Komalo [Mon, 1 Nov 2010 17:47:30 +0000]
Create a one-time, first-run about activity that
introduces the concept of NFC and tags.

Change-Id: I4425ed36c87a71b38e88b0aa2280b22cfd81bcf4

8 years agoam 96049659: Merge "Reenable My tag." into gingerbread
Jeff Hamilton [Mon, 1 Nov 2010 14:54:55 +0000]
am 96049659: Merge "Reenable My tag." into gingerbread

* commit '9604965972aaebbd88e8ebe0dcaba3b7db21495a':
  Reenable My tag.

8 years agoam 8c263d38: Merge "Polish." into gingerbread
Jason parks [Mon, 1 Nov 2010 14:52:35 +0000]
am 8c263d38: Merge "Polish." into gingerbread

* commit '8c263d38c29801ca40b26e44e250483b7678095f':
  Polish.

8 years agoMerge "Reenable My tag." into gingerbread
Jeff Hamilton [Mon, 1 Nov 2010 14:48:14 +0000]
Merge "Reenable My tag." into gingerbread

8 years agoReenable My tag.
Jeff Hamilton [Mon, 1 Nov 2010 14:47:42 +0000]
Reenable My tag.

Change-Id: Icb1bd2df86ed55d33577ddc94b8fcb00e41419f3

8 years agoMerge "Polish." into gingerbread
Jason parks [Mon, 1 Nov 2010 14:41:24 +0000]
Merge "Polish." into gingerbread

8 years agoam 6b3f0531: Cherry pick change to include QuotedPrintableCodecPort in VCardUtils...
Ben Komalo [Sat, 30 Oct 2010 00:08:26 +0000]
am 6b3f0531: Cherry pick change to include QuotedPrintableCodecPort in VCardUtils. Allows Tags to parse non-ascii characters in VCard\'s properly.

* commit '6b3f053198643992e19f6e3433782edd756ec55c':
  Cherry pick change to include QuotedPrintableCodecPort in VCardUtils. Allows Tags to parse non-ascii characters in VCard's properly.

8 years agoCherry pick change to include QuotedPrintableCodecPort in VCardUtils.
Ben Komalo [Fri, 29 Oct 2010 23:08:59 +0000]
Cherry pick change to include QuotedPrintableCodecPort in VCardUtils.
Allows Tags to parse non-ascii characters in VCard's properly.

Change-Id: I5dcc20a7c7e93415d307bca0ab2996bac98d7646

8 years agoPolish.
Jason parks [Fri, 29 Oct 2010 21:14:40 +0000]
Polish.

* When scanning a tag it keeps the title that says
  the tag was scanned.
* For vcard message it now displays the display
  name of the contact rather than text/v-Card.
* Changed the import action on vcards to display
  the display name.

Change-Id: I16f70f2e69a1b891ae2f452959c00b03f3e80281

8 years agoam 78f629e3: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ginger...
Eric Fischer [Fri, 29 Oct 2010 17:49:33 +0000]
am 78f629e3: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit '78f629e3a511eb9795680ee2d7f7ef1c76b877c9':
  Import revised translations.  DO NOT MERGE

8 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 29 Oct 2010 17:45:10 +0000]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 29 Oct 2010 17:17:27 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Iba9ffec46f40fd9d96eaef1831cecd0544140e8f

8 years agoam 41287c83: Add support for VCard parsing. Allows VCard records to actually be resto...
Ben Komalo [Fri, 29 Oct 2010 15:28:27 +0000]
am 41287c83: Add support for VCard parsing. Allows VCard records to actually be restored from My Tag when you re-open the app.

* commit '41287c837506ad8a088676e0fd3bc3aafa18c3f2':
  Add support for VCard parsing. Allows VCard records to actually be restored from My Tag when you re-open the app.

8 years agoam 2ebbda0c: Copy VCard utilities from goog/master:frameworks/opt/vcard/java/com...
Ben Komalo [Fri, 29 Oct 2010 15:28:25 +0000]
am 2ebbda0c: Copy VCard utilities from goog/master:frameworks/opt/vcard/java/com/android/vcard and CharsetUtils

* commit '2ebbda0cb1cbd80535f9266900e34f0abe141c4b':
  Copy VCard utilities from goog/master:frameworks/opt/vcard/java/com/android/vcard and CharsetUtils

8 years agoam a29dc1ba: Update to the new APIs.
Jeff Hamilton [Fri, 29 Oct 2010 15:28:23 +0000]
am a29dc1ba: Update to the new APIs.

* commit 'a29dc1ba19e86ae23f8789bbb8fce6b57130c561':
  Update to the new APIs.

8 years agoAdd support for VCard parsing. Allows VCard records to actually
Ben Komalo [Thu, 28 Oct 2010 21:08:05 +0000]
Add support for VCard parsing. Allows VCard records to actually
be restored from My Tag when you re-open the app.

Change-Id: I59dbff0c82817d0bf594db4bc7fd76e5bebbc703

8 years agoCopy VCard utilities
Ben Komalo [Thu, 28 Oct 2010 18:28:05 +0000]
Copy VCard utilities
from goog/master:frameworks/opt/vcard/java/com/android/vcard
and CharsetUtils

Some massaging done.

Change-Id: I961294ace15f613402a6e7b26c6c4908465ab520

8 years agoUpdate to the new APIs.
Jeff Hamilton [Thu, 28 Oct 2010 22:44:37 +0000]
Update to the new APIs.

Change-Id: I8aed612159d369dd9360ba3bc4aa7ee9c008c718

8 years agoam 834676c7: Add menu that only contains a help item.
Ben Komalo [Thu, 28 Oct 2010 22:48:22 +0000]
am 834676c7: Add menu that only contains a help item.

* commit '834676c7e7716942245037f88fe444adc934b23d':
  Add menu that only contains a help item.

8 years agoAdd menu that only contains a help item.
Ben Komalo [Thu, 28 Oct 2010 21:58:13 +0000]
Add menu that only contains a help item.

Bug: 3143635
Change-Id: I1037f924c10039e286ab4e20d137d711ed4609f6

8 years agoam a6855221: Simplify snippet generation.
Jason parks [Thu, 28 Oct 2010 21:38:15 +0000]
am a6855221: Simplify snippet generation.

* commit 'a6855221fb6e5c6c19d31283a18ced44cccdf442':
  Simplify snippet generation.

8 years agoSimplify snippet generation.
Jason parks [Thu, 28 Oct 2010 21:15:06 +0000]
Simplify snippet generation.

Made ParsedNdefMessage a concrete class and moved
the getSnippet() method to ParsedNdefRecord. There
was no need for another set of classes that knew
how to generate a snippet.

ParsedNdefMessage now contains the logic for which
record to pick for the snippet.

8 years agoam 7a5bab26: Fix help URL at Con Ops\' request in real time...
Roy West [Thu, 28 Oct 2010 20:41:30 +0000]
am 7a5bab26: Fix help URL at Con Ops\' request in real time...

* commit '7a5bab2668d2f0751617cded7ab440161486d423':
  Fix help URL at Con Ops' request in real time...

8 years agoFix help URL at Con Ops' request in real time...
Roy West [Thu, 28 Oct 2010 18:26:52 +0000]
Fix help URL at Con Ops' request in real time...

Change-Id: Ie4cd901d5efedab689076600cc2c4daaf7c26d68

8 years agoam 4085fee0: Merge "Temoprarily disable the My tag tab." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 17:10:25 +0000]
am 4085fee0: Merge "Temoprarily disable the My tag tab." into gingerbread

* commit '4085fee08d8d674086407e7e93b083a579abb0c1':
  Temoprarily disable the My tag tab.

8 years agoMerge "Temoprarily disable the My tag tab." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 17:07:03 +0000]
Merge "Temoprarily disable the My tag tab." into gingerbread

8 years agoTemoprarily disable the My tag tab.
Jeff Hamilton [Thu, 28 Oct 2010 16:34:18 +0000]
Temoprarily disable the My tag tab.

Change-Id: I481f5a7eb752d20885d5955f67eebfd49fff206e

8 years agoam 8833d906: Restore tag records when re-starting MyTag activity. TODO vcard support...
Ben Komalo [Thu, 28 Oct 2010 16:37:53 +0000]
am 8833d906: Restore tag records when re-starting MyTag activity. TODO vcard support (not sure how to do this yet...) TODO storing the tag in a db instead of just relying on the      local message so that contents can be restored even      if the checkbox is off

* commit '8833d906e3c2d0d4e1b339d6c8fdd87cc23640c8':
  Restore tag records when re-starting MyTag activity. TODO vcard support (not sure how to do this yet...) TODO storing the tag in a db instead of just relying on the      local message so that contents can be restored even      if the checkbox is off

8 years agoRestore tag records when re-starting MyTag activity.
Ben Komalo [Thu, 28 Oct 2010 16:16:51 +0000]
Restore tag records when re-starting MyTag activity.
TODO vcard support (not sure how to do this yet...)
TODO storing the tag in a db instead of just relying on the
     local message so that contents can be restored even
     if the checkbox is off

Change-Id: I27574d25ecd9d814db7c73189ac30bd060aa7e1e

8 years agoam 9923125f: Merge "Set the version number to 1.0" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 07:34:35 +0000]
am 9923125f: Merge "Set the version number to 1.0" into gingerbread

8 years agoMerge "Set the version number to 1.0" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 07:30:26 +0000]
Merge "Set the version number to 1.0" into gingerbread

8 years agoSet the version number to 1.0
Jeff Hamilton [Wed, 27 Oct 2010 18:22:25 +0000]
Set the version number to 1.0

Change-Id: I4744e40b1eb2bf7f8fcb25531712b3b53e1c1337

8 years agoam 2eaa4225: Fix an issue where the shared info via the Intent was getting duplicated...
Ben Komalo [Thu, 28 Oct 2010 01:39:47 +0000]
am 2eaa4225: Fix an issue where the shared info via the Intent was getting duplicated on restart of the app.

8 years agoFix an issue where the shared info via the Intent was
Ben Komalo [Thu, 28 Oct 2010 01:10:55 +0000]
Fix an issue where the shared info via the Intent was
getting duplicated on restart of the app.

Change-Id: I3bf41f0ad097803048dcf48d8650236436b80079

8 years agoam b6f6bcee: Add support for sharing URL\'s via My Tag.
Ben Komalo [Wed, 27 Oct 2010 23:24:16 +0000]
am b6f6bcee: Add support for sharing URL\'s via My Tag.

8 years agoAdd support for sharing URL's via My Tag.
Ben Komalo [Wed, 27 Oct 2010 22:46:48 +0000]
Add support for sharing URL's via My Tag.

Change-Id: I39af6516ec2287e1af0c9dc46ca946cbb65cec22

8 years agoMerge "Import revised translations."
Eric Fischer [Wed, 27 Oct 2010 22:17:37 +0000]
Merge "Import revised translations."

8 years agoam 49978888: Initial, but not very nice, sharing of text via My Tag. TODOs - prompt...
Ben Komalo [Wed, 27 Oct 2010 22:05:18 +0000]
am 49978888: Initial, but not very nice, sharing of text via My Tag. TODOs - prompt user for wiping existing tags - launch MyTag within the TagBrowser - add support for images / parsing URL\'s / contacts

8 years agoInitial, but not very nice, sharing of text via My Tag.
Ben Komalo [Wed, 27 Oct 2010 21:46:25 +0000]
Initial, but not very nice, sharing of text via My Tag.
TODOs
- prompt user for wiping existing tags
- launch MyTag within the TagBrowser
- add support for images / parsing URL's / contacts

Change-Id: I9f4d9b2ee5a3a7345ea269acfd8f9bb5c3511542

8 years agoImport revised translations.
Eric Fischer [Wed, 27 Oct 2010 21:36:46 +0000]
Import revised translations.

Change-Id: Ia3fd84dc532ddbeea9bd32eb47b94d045d573391

8 years agoam 40d9a0cd: Switch to a simpler storage model.
Jason parks [Wed, 27 Oct 2010 20:41:14 +0000]
am 40d9a0cd: Switch to a simpler storage model.

8 years agoam 3ec19b74: Prevent NPE when gallery (picasa) doesn\'t give us a cursor for the...
Ben Komalo [Wed, 27 Oct 2010 20:39:21 +0000]
am 3ec19b74: Prevent NPE when gallery (picasa) doesn\'t give us a cursor for the image (can happen on flaky network or in airplane mode, etc).

8 years agoSwitch to a simpler storage model.
Jason parks [Tue, 26 Oct 2010 19:42:45 +0000]
Switch to a simpler storage model.

Going back to the previous storage model of where we only store the messages.
We reference records by appending the offset of the record to the end of the
uri.

When a tag is discovered we start the service to save it. A PendingIntent
is created that will resolve to the currently running activity.

Change-Id: I32d1dd70960fdf67129d1707399d667de030ebe5

8 years agoPrevent NPE when gallery (picasa) doesn't give us a cursor for the image
Ben Komalo [Wed, 27 Oct 2010 20:20:26 +0000]
Prevent NPE when gallery (picasa) doesn't give us a cursor for the image
(can happen on flaky network or in airplane mode, etc).

Bug: 3120721
Change-Id: I01945b6d0d0de10ca3d002c024cb173a57307632

8 years agoam 3df655ad: Merge "Fix bug 3138074. Edit Tags app strings to match mocks." into...
Roy West [Wed, 27 Oct 2010 18:59:11 +0000]
am 3df655ad: Merge "Fix bug 3138074. Edit Tags app strings to match mocks." into gingerbread

8 years agoMerge "Fix bug 3138074. Edit Tags app strings to match mocks." into gingerbread
Roy West [Wed, 27 Oct 2010 18:26:39 +0000]
Merge "Fix bug 3138074. Edit Tags app strings to match mocks." into gingerbread

8 years agoam ad3677ae: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ginger...
Eric Fischer [Wed, 27 Oct 2010 18:03:52 +0000]
am ad3677ae: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into gingerbread

8 years agoFix bug 3138074. Edit Tags app strings to match mocks.
Roy West [Wed, 27 Oct 2010 17:59:49 +0000]
Fix bug 3138074. Edit Tags app strings to match mocks.

Change-Id: I4234a7ac90ca70315ec08f741fbebdd34b573458

8 years agoMerge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Wed, 27 Oct 2010 17:58:48 +0000]
Merge "Import revised translations.  DO NOT MERGE" into gingerbread

8 years agoam ad9a9c83: Wire up delete icon for each record. This introduces an explicit callbac...
Ben Komalo [Wed, 27 Oct 2010 03:23:16 +0000]
am ad9a9c83: Wire up delete icon for each record. This introduces an explicit callbacks interface for the host activity.

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Oct 2010 00:03:03 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I88ebe917ebd479e70e550f56f94f399787d3f6c2

8 years agoam 4761179c: Add a minus sign for deleting a record in tag editor. Click listeners...
Ben Komalo [Tue, 26 Oct 2010 22:42:26 +0000]
am 4761179c: Add a minus sign for deleting a record in tag editor. Click listeners not actually hooked up.

8 years agoWire up delete icon for each record.
Ben Komalo [Tue, 26 Oct 2010 21:26:34 +0000]
Wire up delete icon for each record.
This introduces an explicit callbacks interface
for the host activity.

Change-Id: I381c59176daea4c97daa7f8d392eb30fc181e2a9

8 years agoAdd a minus sign for deleting a record in tag editor.
Ben Komalo [Tue, 26 Oct 2010 21:29:02 +0000]
Add a minus sign for deleting a record in tag editor.
Click listeners not actually hooked up.

Change-Id: Ie6544b12eb92b7afa1674f4eb3cd3a58266cf9f6

8 years agoam 5e361075: support more SmartPoster fields.
Nick Kralevich [Tue, 26 Oct 2010 20:43:16 +0000]
am 5e361075: support more SmartPoster fields.

8 years agoam 93345014: Fix a crasher when saving My Tag.
Jeff Hamilton [Tue, 26 Oct 2010 19:02:21 +0000]
am 93345014: Fix a crasher when saving My Tag.

8 years agosupport more SmartPoster fields.
Nick Kralevich [Fri, 22 Oct 2010 16:57:54 +0000]
support more SmartPoster fields.

Change-Id: I308eb23d8a3df8d5fcecc69b155699ddcfe70203

8 years agoFix a crasher when saving My Tag.
Jeff Hamilton [Tue, 26 Oct 2010 18:02:04 +0000]
Fix a crasher when saving My Tag.

Fix the "no tags" text size and make
the button not flash when loading.

Change-Id: I31301d630fc4e2890b9dc71dfa1e5d838d5826f3

8 years agoam 9e69418c: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 26 Oct 2010 00:31:15 +0000]
am 9e69418c: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9e69418c739d0bafa558119a63a6c07ff3bb7480'

* commit '9e69418c739d0bafa558119a63a6c07ff3bb7480':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 25 Oct 2010 23:52:35 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Icb62ff20cc3c31cafbde25c156a1473c0d4e9895

8 years agoam a5f7fdfc: Do a slightly better job of storing "My tag" in the NFC stack.
Jeff Hamilton [Mon, 25 Oct 2010 21:59:26 +0000]
am a5f7fdfc: Do a slightly better job of storing "My tag" in the NFC stack.

Merge commit 'a5f7fdfc0843abab88ef10a4234727b96f76ac1b'

* commit 'a5f7fdfc0843abab88ef10a4234727b96f76ac1b':
  Do a slightly better job of storing "My tag" in the NFC stack.

8 years agoDo a slightly better job of storing "My tag" in the NFC stack.
Jeff Hamilton [Mon, 25 Oct 2010 21:45:30 +0000]
Do a slightly better job of storing "My tag" in the NFC stack.

Still not functional.

Change-Id: Ie9e9b9b215dc61d3c842b48c10944837c9793421

8 years agoam 20bb7f71: Load contacts data asynchronously.
Ben Komalo [Mon, 25 Oct 2010 19:16:26 +0000]
am 20bb7f71: Load contacts data asynchronously.

Merge commit '20bb7f715556bb336d1335fe09fdb41d9b742c94'

* commit '20bb7f715556bb336d1335fe09fdb41d9b742c94':
  Load contacts data asynchronously.

8 years agoLoad contacts data asynchronously.
Ben Komalo [Mon, 25 Oct 2010 17:56:04 +0000]
Load contacts data asynchronously.

Change-Id: I5e5fbea236dd425dce444fa02d5c8fe49ae977cd