8 years agoam de842743: Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Jan 2011 22:00:42 +0000]
am de842743: Import revised translations.  DO NOT MERGE

* commit 'de8427433a8d232e479de716b27fe77628af302c':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Jan 2011 20:39:58 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I6dc46f4585ba0950e197ab07d8e9b6a8e2cf0438

8 years agoam af4f4cb8: Force tags to be in portrait.
Ben Komalo [Mon, 24 Jan 2011 08:02:11 +0000]
am af4f4cb8: Force tags to be in portrait.

* commit 'af4f4cb8d5d3592a74fc0676e38770193e48ae0b':
  Force tags to be in portrait.

8 years agoMerge commit '1a6913ed' into manualmerge
Ben Komalo [Sat, 22 Jan 2011 00:08:41 +0000]
Merge commit '1a6913ed' into manualmerge

Conflicts:
src/com/android/apps/tag/MyTagList.java

Change-Id: I104007cfc868752088484eff11d7b947be8e8e37

8 years agoMerge commit 'cb41da28' into manualmerge
Ben Komalo [Fri, 21 Jan 2011 19:20:50 +0000]
Merge commit 'cb41da28' into manualmerge

Also resolve some differences that shouldn't be there
this branch should match almost exactly with commit
cb41da281717599.

Conflicts:
AndroidManifest.xml
src/com/android/apps/tag/EditTagActivity.java
src/com/android/apps/tag/provider/TagDBHelper.java

Change-Id: Ia83b895c16447a70bd73228dbf0c98f728519c8c

8 years agoForce tags to be in portrait.
Ben Komalo [Fri, 21 Jan 2011 02:15:37 +0000]
Force tags to be in portrait.

This fixes a bug where rotations would drop the record.
Unfortunately, while fixing this, I discovered that the UI design just
doesn't work in landscape. There's a list halfway at the bottom of the
UI, and you can't put a ListView in a ScrollView, so the user has no way
of scrolling down to see the list contents.

Change-Id: Ic282c066789831ff02725895112e884ea7864c07

8 years agoUsability fixes for tags and DB upgrade code.
Ben Komalo [Tue, 18 Jan 2011 22:45:37 +0000]
Usability fixes for tags and DB upgrade code.

- made creation of a new tag auto-select it as the active one
- add icon to the selected tag
- make tapping on "select active tag" less confusing when
  there are no tags in your list

Bug: 3351616
Bug: 3350480
Bug: 3349221
Bug: 3349209
Change-Id: I683151bf6aae9059a68b3c8f3516592ed1d42777

8 years agoLarge simplification to My tags functionality.
Ben Komalo [Fri, 14 Jan 2011 02:14:21 +0000]
Large simplification to My tags functionality.

- removed image record editing
- removed mandatory text in all My tags
- made the My tags fixed number of records
  the ability to add/remove records
- also fixes unparcelling bugs

Change-Id: Iab6da6eb309ee8ba43cabaa45be1c9442c229a47

8 years agoam 17b15946: Update Tag application for getTechnology API change.
Nick Pelly [Wed, 12 Jan 2011 23:30:55 +0000]
am 17b15946: Update Tag application for getTechnology API change.

* commit '17b15946791544436f24027c906e5a22c3bf72dd':
  Update Tag application for getTechnology API change.

8 years agoUpdate Tag application for getTechnology API change.
Nick Pelly [Mon, 10 Jan 2011 06:28:45 +0000]
Update Tag application for getTechnology API change.

Change-Id: Iabb00848b97ce262e8a0c146197d7d6bcd4adb07

8 years agoam 1132699b: (-s ours) Merge "Import translations for additional languages." into...
Eric Fischer [Sat, 8 Jan 2011 13:24:07 +0000]
am 1132699b: (-s ours) Merge "Import translations for additional languages." into gingerbread

* commit '1132699b52b9cfd6f4861f4212b06d2d08b12fdf':
  Import translations for additional languages.

8 years agoam 880c64fc: Import some unabbreviated translations for large screens.
Eric Fischer [Fri, 7 Jan 2011 21:01:19 +0000]
am 880c64fc: Import some unabbreviated translations for large screens.

* commit '880c64fc817d6d18fd2afe559dac938b702a0548':
  Import some unabbreviated translations for large screens.

8 years agoresolved conflicts for merge of c749051b to honeycomb-plus-aosp
Ben Komalo [Fri, 7 Jan 2011 18:27:03 +0000]
resolved conflicts for merge of c749051b to honeycomb-plus-aosp

Change-Id: I63760c0d58376b6cdcc4f71ebcd701e6cca9240d

8 years agoImport some unabbreviated translations for large screens.
Eric Fischer [Fri, 7 Jan 2011 01:48:09 +0000]
Import some unabbreviated translations for large screens.

Change-Id: Id8358bb4bad92b87b006e875c0d00e5a65fd08de

8 years agoMerge "Import translations for additional languages." into gingerbread
Eric Fischer [Thu, 6 Jan 2011 22:02:53 +0000]
Merge "Import translations for additional languages." into gingerbread

8 years agoImport translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:40:18 +0000]
Import translations for additional languages.

Change-Id: I6874cd3d701aa235de8ef3fbe21139d27e1dc02b

8 years agoTemporary fix for sharing content via My Tag
Ben Komalo [Wed, 22 Dec 2010 16:47:42 +0000]
Temporary fix for sharing content via My Tag
from other activities until we solidfy
the workflow.

Bug: 3288855
Change-Id: I32df3869cefcf3abdeda11f8424160d815060e62

8 years agoam c27e0b7e: Fix notification sound for tag discovery. The create() convenience funct...
Ben Komalo [Tue, 4 Jan 2011 19:36:57 +0000]
am c27e0b7e: Fix notification sound for tag discovery. The create() convenience function calls prepare(), which disallows further modification to the MediaPlayer.

* commit 'c27e0b7e8c87db872bf3fd7ceda169ad725be33c':
  Fix notification sound for tag discovery. The create() convenience function calls prepare(), which disallows further modification to the MediaPlayer.

8 years agoam a2c45606: Only clear the empty view on initial launch prior to the first data...
Ben Komalo [Tue, 4 Jan 2011 19:35:02 +0000]
am a2c45606: Only clear the empty view on initial launch prior to the first data load. This fixes an issue where views were modified in a non-UI thread (unnecessarily).

* commit 'a2c45606f832f8eb4cac93a238c178e361d2c2df':
  Only clear the empty view on initial launch prior to the first data load. This fixes an issue where views were modified in a non-UI thread (unnecessarily).

8 years agoAdd context menu (long press) on items
Ben Komalo [Thu, 23 Dec 2010 19:32:00 +0000]
Add context menu (long press) on items
in my tag list so users can delete them.

Change-Id: I9e2b565511f6f5c2d899db1c303c930ee9852819

8 years agoImport revised translations.
Eric Fischer [Thu, 23 Dec 2010 22:18:37 +0000]
Import revised translations.

Change-Id: I9077d029ded26d5c0bfea2578c2d7c3ccbb68599

8 years agoFix notification sound for tag discovery.
Ben Komalo [Thu, 23 Dec 2010 20:25:58 +0000]
Fix notification sound for tag discovery.
The create() convenience function calls
prepare(), which disallows further modification
to the MediaPlayer.

Note: the system (instead of the app)
may play the notification in the future,
depending on changes we make to the workflow

Change-Id: Ia0430930ccba30d21e79b510c449b63dcb01fe0e

8 years agoOnly clear the empty view on initial launch
Ben Komalo [Thu, 23 Dec 2010 19:49:32 +0000]
Only clear the empty view on initial launch
prior to the first data load. This fixes
an issue where views were modified in
a non-UI thread (unnecessarily).

Bug: 3307266
Change-Id: I6a3db0932caed9773677214f5f7e05cd00f65fce

8 years agoam a6f38c79: Hack in tag writing support for non-user builds.
Jeff Hamilton [Wed, 22 Dec 2010 20:51:05 +0000]
am a6f38c79: Hack in tag writing support for non-user builds.

* commit 'a6f38c798841248a57276f19711076f152eecd49':
  Hack in tag writing support for non-user builds.

8 years agoHack in tag writing support for non-user builds.
Jeff Hamilton [Fri, 17 Dec 2010 22:16:21 +0000]
Hack in tag writing support for non-user builds.

The UX is horrible, but it does let you do
basic tag writing. To use it go to My Tag
create a tag you want to write the select
"Write to next tag scanned" from the context
menu of the tag you want to write.

The next time any tag is scanned it will try
to write that message and will show a toast
with the result of the write attempt.

Regardless of success the write request will
be erased at the scan.

Change-Id: Ib4eb4762979bf178bfdb588b7d8a6788b02631d2

8 years agoam 8974f891: (-s ours) Re-implements MyTagList UI.
Ben Komalo [Wed, 15 Dec 2010 19:08:08 +0000]
am 8974f891: (-s ours) Re-implements MyTagList UI.

* commit '8974f891e10a1f3dc773d8a7036dec67ed67a361':
  Re-implements MyTagList UI.

8 years agoRe-implements MyTagList UI.
Ben Komalo [Thu, 9 Dec 2010 21:37:32 +0000]
Re-implements MyTagList UI.

Mostly a revert of:
  commit 8e2c2b329fe523d782df6cd313b78c9d11f90cc3.
  "DO NOT MERGE revert to simple My Tag UI."

Change-Id: I00581a4f2246a84a84481a6ec4528f6253f82e86

8 years agoam 80e02347: First pass at advanced NFC tag dispatching APIs and other cleanup.
Jeff Hamilton [Mon, 13 Dec 2010 20:31:40 +0000]
am 80e02347: First pass at advanced NFC tag dispatching APIs and other cleanup.

* commit '80e02347d3417389fc8b18d06b7172023f0d203e':
  First pass at advanced NFC tag dispatching APIs and other cleanup.

8 years agoam e095ece7: Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into...
Nick Pelly [Mon, 13 Dec 2010 20:30:45 +0000]
am e095ece7: Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

* commit 'e095ece7b6c691b1c49d23cb42dc87f9957e665d':
  Update Tag for new NfcAdapter.getDefaultAdapter(Context)

8 years agoFirst pass at advanced NFC tag dispatching APIs and other cleanup.
Jeff Hamilton [Fri, 3 Dec 2010 23:34:31 +0000]
First pass at advanced NFC tag dispatching APIs and other cleanup.

Change-Id: I288a13cea9967c2f852200e8bd1a802b7d96655d

8 years agoMerge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
Nick Pelly [Sat, 11 Dec 2010 01:19:03 +0000]
Merge "Update Tag for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

8 years agoMerge "Import revised translations."
Eric Fischer [Fri, 10 Dec 2010 18:57:35 +0000]
Merge "Import revised translations."

8 years agoam 3fda14b0: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 18:08:14 +0000]
am 3fda14b0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '3fda14b0e37f8b6548a5d42df7e282e53541f43f':
  Import revised translations.  DO NOT MERGE

8 years agoUpdate Tag for new NfcAdapter.getDefaultAdapter(Context)
Nick Pelly [Fri, 10 Dec 2010 03:40:48 +0000]
Update Tag for new NfcAdapter.getDefaultAdapter(Context)

Change-Id: Id011c19c8a92314f5360c40dce1b14f7bd4e62dd

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 00:57:54 +0000]
Import revised translations.  DO NOT MERGE

Bug 3272618

Change-Id: Ibb796933cf275179e811f0ad250eb2056d13ad47

8 years agoImport revised translations.
Eric Fischer [Fri, 10 Dec 2010 00:09:15 +0000]
Import revised translations.

Change-Id: I14e2d7f76a5d7fc6c1c05f0e3e6d82dfd76bcdea

8 years agoam 43a3e66c: Empty commit to synchronize gingerbread and gingerbread-nfc.
Nick Pelly [Mon, 6 Dec 2010 19:55:02 +0000]
am 43a3e66c: Empty commit to synchronize gingerbread and gingerbread-nfc.

* commit '43a3e66c54f212f0d761b5493bcd018a695ba3b2':
  Empty commit to synchronize gingerbread and gingerbread-nfc.

8 years agoam c0b377e6: Merge gingerbread-nfc into gingerbread.
Nick Pelly [Mon, 6 Dec 2010 18:43:08 +0000]
am c0b377e6: Merge gingerbread-nfc into gingerbread.

* commit 'c0b377e6cb06de7511d052c3a5693655e82dcfb7':
  Revert "Merge "Remove manifest refernece to My Tag activity." into gingerbread"
  Stop sending fake tags via the cannon.
  Revert "Remove the My Tag feature."

8 years agoEmpty commit to synchronize gingerbread and gingerbread-nfc.
Nick Pelly [Mon, 6 Dec 2010 01:36:44 +0000]
Empty commit to synchronize gingerbread and gingerbread-nfc.

8 years agoMerge gingerbread-nfc into gingerbread.
Nick Pelly [Sun, 5 Dec 2010 21:32:12 +0000]
Merge gingerbread-nfc into gingerbread.

Change-Id: Ie81d30ba1e5c73490cdc3bfb02a27629f06b3521

8 years agoam fe99725f: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 1 Dec 2010 11:36:30 +0000]
am fe99725f: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'fe99725f16ac95705fef8743768eaa1730a84333':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 30 Nov 2010 00:17:23 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I5b8ff88850dd96320af04e50a35726c896aed6ae

8 years agoImport revised translations.
Eric Fischer [Mon, 29 Nov 2010 23:18:04 +0000]
Import revised translations.

Change-Id: I2b6975f8d62b4a4108b92732d82be870313a7e8b

8 years agoManually merge d877e0c4 from gingerbread-plus-aosp
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:52:51 +0000]
Manually merge d877e0c4 from gingerbread-plus-aosp

Change-Id: I2709295a0170928647159a9254e930eb04681fd1

8 years agoam 7cce6552: Release the MediaPlayer object after it is finished playing.
Jason parks [Fri, 19 Nov 2010 19:12:51 +0000]
am 7cce6552: Release the MediaPlayer object after it is finished playing.

* commit '7cce65525f7f781c6be793a3c116874f46911524':
  Release the MediaPlayer object after it is finished playing.

8 years agoRevert "Merge "Remove manifest refernece to My Tag activity." into gingerbread"
Jeff Hamilton [Thu, 18 Nov 2010 14:46:39 +0000]
Revert "Merge "Remove manifest refernece to My Tag activity." into gingerbread"

This reverts commit d877e0c443fc4ceb4fdd441dde5778978638e7ee, reversing
changes made to 7cce65525f7f781c6be793a3c116874f46911524.

8 years agoImport revised translations.
Eric Fischer [Wed, 17 Nov 2010 19:41:27 +0000]
Import revised translations.

Change-Id: I92ae2531e7fcfc8ff423a1bfeeed942013c5d39d

8 years agoStop sending fake tags via the cannon.
Jeff Hamilton [Fri, 12 Nov 2010 18:30:18 +0000]
Stop sending fake tags via the cannon.

Change-Id: Iba6ccb3b94302eabd467e83476500fa680ab89b9

8 years agoRevert "Remove the My Tag feature."
Jeff Hamilton [Thu, 11 Nov 2010 21:24:36 +0000]
Revert "Remove the My Tag feature."

This reverts commit fd860fde813f58808b389fbc4f9120a89a90b27e.

8 years agoMerge "Remove manifest refernece to My Tag activity." into gingerbread tegra-10.11.0 tegra-10.11.1 tegra-10.11.1.1 tegra-10.11.2 tegra-10.11.3 tegra-10.11.4 tegra-10.11.5 tegra-10.11.ER1 tegra-T30.ER1
Jeff Hamilton [Tue, 9 Nov 2010 14:55:13 +0000]
Merge "Remove manifest refernece to My Tag activity." into gingerbread

8 years agoRemove manifest refernece to My Tag activity.
Jeff Hamilton [Sat, 6 Nov 2010 05:55:21 +0000]
Remove manifest refernece to My Tag activity.

Also remove a reference to My Tag in the help text.

Bug: 3158751
Change-Id: I7dae422a6c73bfc868a6d3db2c7b7609f0ac92c8

8 years agoRelease the MediaPlayer object after it is finished playing.
Jason parks [Thu, 4 Nov 2010 22:11:10 +0000]
Release the MediaPlayer object after it is finished playing.

Change-Id: Ic20bfbff611bbee04b01cb5adf667d722f9d47ec

8 years agoresolved conflicts for merge of be1cf84f to master
Jason Chen [Thu, 4 Nov 2010 17:48:22 +0000]
resolved conflicts for merge of be1cf84f to master

Change-Id: I4ba4c1c54a301e05d204a1c8ef2cf45557974046

8 years agoam 39523c7c: Don\'t show the tag scanned activity over the lockscreen.
Jeff Hamilton [Thu, 4 Nov 2010 17:29:17 +0000]
am 39523c7c: Don\'t show the tag scanned activity over the lockscreen.

* commit '39523c7c2e4df38d674a33c4c4631ed908ad3c9e':
  Don't show the tag scanned activity over the lockscreen.

8 years agoBump the database version.
Jeff Hamilton [Thu, 4 Nov 2010 05:30:07 +0000]
Bump the database version.

Previous builds used version 13, which
was reverted. That caused the app to crash
when launched because it tried to downgrade
to version 12.

Change-Id: I6697e938da87b92a916ec9a1511ee90154b1442d

8 years agoReally "fix" the build
Jason Chen [Thu, 4 Nov 2010 05:01:20 +0000]
Really "fix" the build

Need to disable the TagTests too

Change-Id: I2954f40e66e21960171a7daf21d2599e72957af0

8 years agoDon't build Tag in master for now
Jason Chen [Thu, 4 Nov 2010 04:24:20 +0000]
Don't build Tag in master for now

Change-Id: I550ab47ed5115d88a7fcbbfb2188a25a7596f87d

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 agoDon't show the tag scanned activity over the lockscreen.
Jeff Hamilton [Thu, 4 Nov 2010 00:37:58 +0000]
Don't show the tag scanned activity over the lockscreen.

Bug: 3163663
Change-Id: I5ad704030b1d0ecdcf49551831d9bcc2af646aa1

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