8 years agoImport revised translations.
Eric Fischer [Thu, 17 Feb 2011 18:21:04 +0000]
Import revised translations.

Change-Id: Iea7003871d2dd33e59e2a1e927c4a09eb1e07080

8 years agoam ae76516d: (-s ours) am 0a4043e0: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:42:13 +0000]
am ae76516d: (-s ours) am 0a4043e0: Import revised translations.  DO NOT MERGE

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

8 years agoam 0a4043e0: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:36:59 +0000]
am 0a4043e0: Import revised translations.  DO NOT MERGE

* commit '0a4043e0c12eb8efad8f32298efbe4d16152633b':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Feb 2011 18:22:59 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ibc70d4fe5731ba9eab549c7943a64108316c588e

8 years agoam e17d6fd3: am 862b9759: Merge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Thu, 10 Feb 2011 21:57:22 +0000]
am e17d6fd3: am 862b9759: Merge "Fix context menus on user builds." into gingerbread

* commit 'e17d6fd382f7b3279a6ba07a53f439247ac1a5b4':
  Fix context menus on user builds.

8 years agoam 5c735c86: (-s ours) am d84c1bac: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Thu, 10 Feb 2011 21:57:20 +0000]
am 5c735c86: (-s ours) am d84c1bac: (-s ours) Import revised translations.  DO NOT MERGE

* commit '5c735c86b6bcbce24ac51f165ed9a314efab15b5':
  Import revised translations.  DO NOT MERGE

8 years agoam 862b9759: Merge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Thu, 10 Feb 2011 21:52:18 +0000]
am 862b9759: Merge "Fix context menus on user builds." into gingerbread

* commit '862b975969e386fc7fa611c58e0e657c6977c83e':
  Fix context menus on user builds.

8 years agoam d84c1bac: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 10 Feb 2011 21:51:45 +0000]
am d84c1bac: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 9ca3e688: (-s ours) am 069c50cb: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:52:19 +0000]
am 9ca3e688: (-s ours) am 069c50cb: Import revised translations.  DO NOT MERGE

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

8 years agoam 069c50cb: Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 18:47:56 +0000]
am 069c50cb: Import revised translations.  DO NOT MERGE

* commit '069c50cb9a5f1da7edbc99b82f43ff71ec555002':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Feb 2011 02:03:25 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I510ff3b0be91643d1ef37d4faf3e691b5507d1eb

8 years agoMerge "Fix context menus on user builds." into gingerbread
Jeff Hamilton [Wed, 9 Feb 2011 01:50:42 +0000]
Merge "Fix context menus on user builds." into gingerbread

8 years agoFix context menus on user builds.
Jeff Hamilton [Wed, 9 Feb 2011 01:50:04 +0000]
Fix context menus on user builds.

Change-Id: I0d4007319c881a8b4db4aa52b8f61ff86803e3a9

8 years agoam aae5d223: (-s ours) am bcb8a75a: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:53:08 +0000]
am aae5d223: (-s ours) am bcb8a75a: Import revised translations.  DO NOT MERGE

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

8 years agoam bcb8a75a: Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 18:45:51 +0000]
am bcb8a75a: Import revised translations.  DO NOT MERGE

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

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Feb 2011 01:31:31 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I34d7020de72c22437e83eb36eda5ce5de2814a86

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:38:38 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I68464a3f8fe64d53c5105293162016f7963e8ac1

8 years agoUpdate Tag.apk for final GB MR changes.
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
Update Tag.apk for final GB MR changes.

Change-Id: I598ba6429113242882b4ad532a527734b873461d

8 years agoam 32d0dc00: am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into ginger...
Nick Pelly [Tue, 1 Feb 2011 22:23:20 +0000]
am 32d0dc00: am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread

* commit '32d0dc006ddc414d65dfa409d6e298b6e0197cc0':
  Update Tag.apk for final GB MR changes.

8 years agoam 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 22:19:16 +0000]
am 2313ef98: Merge "Update Tag.apk for final GB MR changes." into gingerbread

* commit '2313ef98f21a8d2824b738a2f61e04919381eb43':
  Update Tag.apk for final GB MR changes.

8 years agoam 457c96d1: (-s ours) am f37c6139: DO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 21:27:15 +0000]
am 457c96d1: (-s ours) am f37c6139: DO NOT MERGE

* commit '457c96d163451ce6e4dd858650ab933a6bf093bb':
  DO NOT MERGE

8 years agoam f37c6139: DO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 19:50:32 +0000]
am f37c6139: DO NOT MERGE

* commit 'f37c6139a0cb05c5d8a495c718cbe0e5a89e7785':
  DO NOT MERGE

8 years agoDO NOT MERGE
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
DO NOT MERGE

Cherry-pick from GB to HC.

Update Tag.apk for final GB MR changes.

Change-Id: I2ade30d01f76929861deef3a685dc326d00cdae4

8 years agoam efe16feb: (-s ours) resolved conflicts for merge of fb20fb14 to honeycomb-plus...
Eric Fischer [Tue, 1 Feb 2011 18:05:12 +0000]
am efe16feb: (-s ours) resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp

* commit 'efe16febefe47888cfefde0215ea80ea3de498c0':
  Import revised translations.  DO NOT MERGE.  Bug 3394542

8 years agoMerge "Update Tag.apk for final GB MR changes." into gingerbread
Nick Pelly [Tue, 1 Feb 2011 17:39:48 +0000]
Merge "Update Tag.apk for final GB MR changes." into gingerbread

8 years agoUpdate Tag.apk for final GB MR changes.
Nick Pelly [Tue, 1 Feb 2011 16:26:41 +0000]
Update Tag.apk for final GB MR changes.

Change-Id: Ia3e06f162dc33c2a706ecbc2d433ab1df38303d1

8 years agoresolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp
Eric Fischer [Tue, 1 Feb 2011 02:49:26 +0000]
resolved conflicts for merge of fb20fb14 to honeycomb-plus-aosp

Change-Id: I6b80957186ce855000fd8292ca080ae47e37da49

8 years agoam e89f7ae5: (-s ours) am 97a18afe: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Tue, 1 Feb 2011 02:15:28 +0000]
am e89f7ae5: (-s ours) am 97a18afe: (-s ours) Import revised translations. DO NOT MERGE

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

8 years agoam 97a18afe: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 01:49:12 +0000]
am 97a18afe: (-s ours) Import revised translations. DO NOT MERGE

* commit '97a18afe60d90f65bb98138e12bd5bffcf618194':
  Import revised translations. DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE. Bug 3394542
Eric Fischer [Mon, 31 Jan 2011 20:48:52 +0000]
Import revised translations.  DO NOT MERGE.  Bug 3394542

Change-Id: Ia93ea0edcc209740369ed0043fbd7e8e17d941de

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 31 Jan 2011 20:26:10 +0000]
Import revised translations. DO NOT MERGE

Change-Id: Ie680fba28e06d6b1ba350229cba4deffd96cb037

8 years agoam b4fd2aa0: Reconcile gingerbread-plus-aosp and honeycomb
The Android Open Source Project [Sun, 30 Jan 2011 20:56:01 +0000]
am b4fd2aa0: Reconcile gingerbread-plus-aosp and honeycomb

* commit 'b4fd2aa0e2a3befc7d6298d6d700a6fcd24ccbf6':

8 years agoReconcile gingerbread-plus-aosp and honeycomb
The Android Open Source Project [Sun, 30 Jan 2011 20:42:36 +0000]
Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: If2c37777a56ddcfd034ffd75c88b7a5d7d70e11f

8 years agoMass merge from gingerbread - do not merge
The Android Open Source Project [Sun, 30 Jan 2011 20:42:36 +0000]
Mass merge from gingerbread - do not merge

Change-Id: I08e52431a892c936bc82bdd70c55b16f5f09892b

8 years agoMerge from honeycomb
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:32:34 +0000]
Merge from honeycomb

Change-Id: I2778dfd3a4cf20255e07483dcc3676b2fca022b9

8 years agoam d1d8c898: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 19:24:33 +0000]
am d1d8c898: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff...
Jeff Hamilton [Sat, 29 Jan 2011 19:07:48 +0000]
am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff. Add text type." into gingerbread

* commit '80d228d9dc94a11e3d9238b2b933d075f77a75ea':
  Don't crash when not selecting a contact. Fix some more UI stuff. Add text type.

8 years agoam b37549fa: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 18:47:06 +0000]
am b37549fa: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam a28ec9f2: UI tweaks
Jeff Hamilton [Sat, 29 Jan 2011 18:16:01 +0000]
am a28ec9f2: UI tweaks

* commit 'a28ec9f29875e2f81aa889f7dc57b21c6b72de75':
  UI tweaks

8 years agoam 516ca5bc: Update to the new APIs for tech dispatch.
Jeff Hamilton [Sat, 29 Jan 2011 17:39:57 +0000]
am 516ca5bc: Update to the new APIs for tech dispatch.

* commit '516ca5bcef9b1e0730497e865b38ae2340175dad':
  Update to the new APIs for tech dispatch.

8 years agoam 154bbba1: (-s ours) am d1d8c898: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Sat, 29 Jan 2011 17:18:26 +0000]
am 154bbba1: (-s ours) am d1d8c898: (-s ours) Import revised translations.  DO NOT MERGE

* commit '154bbba1305b9580c393a18ebaf4b07ffe1fb093':
  Import revised translations.  DO NOT MERGE

8 years agoam d1d8c898: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 17:12:59 +0000]
am d1d8c898: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 48e3e617: am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some...
Jeff Hamilton [Sat, 29 Jan 2011 17:00:27 +0000]
am 48e3e617: am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff. Add text type." into gingerbread

* commit '48e3e617b6a74f79f655cd97d09a82e316d1e2ef':
  Don't crash when not selecting a contact. Fix some more UI stuff. Add text type.

8 years agoam 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff...
Jeff Hamilton [Sat, 29 Jan 2011 16:56:33 +0000]
am 80d228d9: Merge "Don\'t crash when not selecting a contact. Fix some more UI stuff. Add text type." into gingerbread

* commit '80d228d9dc94a11e3d9238b2b933d075f77a75ea':
  Don't crash when not selecting a contact. Fix some more UI stuff. Add text type.

8 years agoam e920cb79: (-s ours) am b37549fa: (-s ours) Import revised translations. DO NOT...
Eric Fischer [Sat, 29 Jan 2011 16:38:24 +0000]
am e920cb79: (-s ours) am b37549fa: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam b37549fa: (-s ours) Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 16:02:44 +0000]
am b37549fa: (-s ours) Import revised translations.  DO NOT MERGE

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

8 years agoam 5f8ccf9e: Improved tag writing support.
Jeff Hamilton [Sat, 29 Jan 2011 15:09:01 +0000]
am 5f8ccf9e: Improved tag writing support.

* commit '5f8ccf9e9e87a24b7b898cfa67dc84dbb7ee7349':
  Improved tag writing support.

8 years agoam c092dd2a: Merge "Allow creation of new contacts when picking." into gingerbread
Ben Komalo [Sat, 29 Jan 2011 02:44:29 +0000]
am c092dd2a: Merge "Allow creation of new contacts when picking." into gingerbread

* commit 'c092dd2a6bd8581b3c924faecfd0d440d5893e90':
  Allow creation of new contacts when picking.

8 years agoam 89b3e169: Merge "Update to the new NFC APIs." into gingerbread
Jeff Hamilton [Sat, 29 Jan 2011 02:44:18 +0000]
am 89b3e169: Merge "Update to the new NFC APIs." into gingerbread

* commit '89b3e169131e8552e91eebd745ec3cd704290761':
  Update to the new NFC APIs.

8 years agoam d3af467b: (-s ours) am 25ffbb26: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:18:27 +0000]
am d3af467b: (-s ours) am 25ffbb26: Import revised translations.  DO NOT MERGE

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

8 years agoam 25ffbb26: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 23:14:07 +0000]
am 25ffbb26: Import revised translations.  DO NOT MERGE

* commit '25ffbb26da612071e4dc4a3950b0c8abb2642c08':
  Import revised translations.  DO NOT MERGE

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 22:58:44 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I714b5d7f6f275425d5fd0a8f0bca53241e785c7d

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 21:22:24 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Id19098fb431d77f9778d87d354adc8beb3427b8e

8 years agoam af4f4cb8: Force tags to be in portrait.
Ben Komalo [Fri, 28 Jan 2011 05:21:11 +0000]
am af4f4cb8: Force tags to be in portrait.

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

8 years agoMerge "Don't crash when not selecting a contact. Fix some more UI stuff. Add text...
Jeff Hamilton [Fri, 28 Jan 2011 03:23:47 +0000]
Merge "Don't crash when not selecting a contact. Fix some more UI stuff. Add text type." into gingerbread

8 years agoam 1a6913ed: Usability fixes for tags and DB upgrade code.
Ben Komalo [Fri, 28 Jan 2011 02:38:57 +0000]
am 1a6913ed: Usability fixes for tags and DB upgrade code.

* commit '1a6913ede1470fc2c7828e912190b50c19f9a3e2':
  Usability fixes for tags and DB upgrade code.

8 years agoDon't crash when not selecting a contact.
Jeff Hamilton [Thu, 27 Jan 2011 21:11:34 +0000]
Don't crash when not selecting a contact.
Fix some more UI stuff. Add text type.

Bug: 3379320
Change-Id: I07c7f14a54552ba5ce24a252d9d650c2b21f50c9

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:04:24 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: I3f773cc86d7f05b75e159c5262ecdf902d94dd47

8 years agoam cb41da28: Large simplification to My tags functionality.
Ben Komalo [Thu, 27 Jan 2011 19:24:17 +0000]
am cb41da28: Large simplification to My tags functionality.

* commit 'cb41da2817175996179cc34e50e5e284d043d3cc':
  Large simplification to My tags functionality.

8 years agoam 51fac69a: am a28ec9f2: UI tweaks
Jeff Hamilton [Thu, 27 Jan 2011 16:36:12 +0000]
am 51fac69a: am a28ec9f2: UI tweaks

* commit '51fac69ab31f9719acff3545d8f2cf0cd609ddf0':
  UI tweaks

8 years agoam a28ec9f2: UI tweaks
Jeff Hamilton [Thu, 27 Jan 2011 16:32:32 +0000]
am a28ec9f2: UI tweaks

* commit 'a28ec9f29875e2f81aa889f7dc57b21c6b72de75':
  UI tweaks

8 years agoUI tweaks
Jeff Hamilton [Wed, 26 Jan 2011 23:32:29 +0000]
UI tweaks

Change-Id: Iec3516551ed5cd7a2247ba0a02959d24474956f3

8 years agoam 535b1d1f: resolved conflicts for merge of bedfbe19 to honeycomb-plus-aosp
Eric Fischer [Thu, 27 Jan 2011 03:10:46 +0000]
am 535b1d1f: resolved conflicts for merge of bedfbe19 to honeycomb-plus-aosp

* commit '535b1d1fe571dff42535e005e3c7b3150a296b93':
  Import revised translations.  DO NOT MERGE

8 years agoresolved conflicts for merge of bedfbe19 to honeycomb-plus-aosp
Eric Fischer [Thu, 27 Jan 2011 02:00:06 +0000]
resolved conflicts for merge of bedfbe19 to honeycomb-plus-aosp

Change-Id: I95d24ee36dc45196c777d1e4add87e2e0ba94a65

8 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 00:40:19 +0000]
Import revised translations.  DO NOT MERGE

Change-Id: Ic9f0d02a6eb8cf444b073ffa46b64b544fa7ba4a

8 years agoam 58ccfe9f: am 516ca5bc: Update to the new APIs for tech dispatch.
Jeff Hamilton [Wed, 26 Jan 2011 00:22:09 +0000]
am 58ccfe9f: am 516ca5bc: Update to the new APIs for tech dispatch.

* commit '58ccfe9f57b9bf7cb564b12ab7320a043bb83c93':
  Update to the new APIs for tech dispatch.

8 years agoam 17b15946: Update Tag application for getTechnology API change.
Nick Pelly [Wed, 26 Jan 2011 00:16:11 +0000]
am 17b15946: Update Tag application for getTechnology API change.

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

8 years agoam 516ca5bc: Update to the new APIs for tech dispatch.
Jeff Hamilton [Wed, 26 Jan 2011 00:04:22 +0000]
am 516ca5bc: Update to the new APIs for tech dispatch.

* commit '516ca5bcef9b1e0730497e865b38ae2340175dad':
  Update to the new APIs for tech dispatch.

8 years agoUpdate to the new APIs for tech dispatch.
Jeff Hamilton [Tue, 25 Jan 2011 06:42:06 +0000]
Update to the new APIs for tech dispatch.

Change-Id: I13f3d9a9ec04af6a230fca99c0303f0328a2a14a

8 years agoam d6b83d40: Merge gingerbread-plus-aosp into honeycomb-plus-aosp
Nick Pelly [Tue, 25 Jan 2011 22:06:54 +0000]
am d6b83d40: Merge gingerbread-plus-aosp into honeycomb-plus-aosp

* commit 'd6b83d40006e8a5a5b1fb8e4cd5c467564e6a654':

8 years agoMerge gingerbread-plus-aosp into honeycomb-plus-aosp
Nick Pelly [Tue, 25 Jan 2011 21:38:33 +0000]
Merge gingerbread-plus-aosp into honeycomb-plus-aosp

Change-Id: I8d2b2f31301d74cb06488f705749f5ff17347b4d

8 years agoam 1132699b: (-s ours) Merge "Import translations for additional languages." into...
Eric Fischer [Tue, 25 Jan 2011 21:33:30 +0000]
am 1132699b: (-s ours) Merge "Import translations for additional languages." into gingerbread

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

8 years agoMerge c749051b into honeycomb-merge
Nick Pelly [Tue, 25 Jan 2011 21:31:00 +0000]
Merge c749051b into honeycomb-merge

Change-Id: Ic2f8353b76e6b73a1acc621aa9c6cdb828fda6be

8 years agoam 2dc242e2: Add context menu (long press) on items in my tag list so users can delet...
Ben Komalo [Tue, 25 Jan 2011 21:27:23 +0000]
am 2dc242e2: Add context menu (long press) on items in my tag list so users can delete them.

* commit '2dc242e23431dce7696555af3a7b2ff7a660c588':
  Add context menu (long press) on items in my tag list so users can delete them.

8 years agoam d345729f: am 5f8ccf9e: Improved tag writing support.
Jeff Hamilton [Tue, 25 Jan 2011 18:09:06 +0000]
am d345729f: am 5f8ccf9e: Improved tag writing support.

* commit 'd345729f06b09c383d899a507cc64699c9be56bb':
  Improved tag writing support.

8 years agoam 5f8ccf9e: Improved tag writing support.
Jeff Hamilton [Tue, 25 Jan 2011 18:03:02 +0000]
am 5f8ccf9e: Improved tag writing support.

* commit '5f8ccf9e9e87a24b7b898cfa67dc84dbb7ee7349':
  Improved tag writing support.

8 years agoam 568d6ed5: am c092dd2a: Merge "Allow creation of new contacts when picking." into...
Ben Komalo [Mon, 24 Jan 2011 22:37:26 +0000]
am 568d6ed5: am c092dd2a: Merge "Allow creation of new contacts when picking." into gingerbread

* commit '568d6ed5344c6abf342053ac7b791be0d7aa2ceb':
  Allow creation of new contacts when picking.

8 years agoam 728ef049: am 89b3e169: Merge "Update to the new NFC APIs." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 22:37:24 +0000]
am 728ef049: am 89b3e169: Merge "Update to the new NFC APIs." into gingerbread

* commit '728ef0497a83ec50ec04f61290bed8c645256e53':
  Update to the new NFC APIs.

8 years agoam c092dd2a: Merge "Allow creation of new contacts when picking." into gingerbread
Ben Komalo [Mon, 24 Jan 2011 22:34:13 +0000]
am c092dd2a: Merge "Allow creation of new contacts when picking." into gingerbread

* commit 'c092dd2a6bd8581b3c924faecfd0d440d5893e90':
  Allow creation of new contacts when picking.

8 years agoam 89b3e169: Merge "Update to the new NFC APIs." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 22:34:11 +0000]
am 89b3e169: Merge "Update to the new NFC APIs." into gingerbread

* commit '89b3e169131e8552e91eebd745ec3cd704290761':
  Update to the new NFC APIs.

8 years agoam 91222103: (-s ours) am de842743: Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 24 Jan 2011 22:04:01 +0000]
am 91222103: (-s ours) am de842743: Import revised translations.  DO NOT MERGE

* commit '9122210359d6fc99d9c9b02e0dfc002255e4127e':
  Import revised translations.  DO NOT MERGE

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 agoImproved tag writing support.
Jeff Hamilton [Sun, 23 Jan 2011 22:57:33 +0000]
Improved tag writing support.

Now you go to an activity that prompts
you to scan a tag to write to it and
prints out the status when a tag is
scanned.

Still hidden on user builds since the
UI is really rough and has a lot of
known issues.

Change-Id: I56edccb80b3ab599c849e23f4ec5897a0cc97090

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 "Allow creation of new contacts when picking." into gingerbread
Ben Komalo [Fri, 21 Jan 2011 20:18:38 +0000]
Merge "Allow creation of new contacts when picking." into gingerbread

8 years agoMerge "Update to the new NFC APIs." into gingerbread
Jeff Hamilton [Fri, 21 Jan 2011 19:34:33 +0000]
Merge "Update to the new NFC APIs." into gingerbread

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 agoUpdate to the new NFC APIs.
Jeff Hamilton [Fri, 21 Jan 2011 19:30:53 +0000]
Update to the new NFC APIs.

Change-Id: I62ba9b0d030cd1ee608695d73f0e478294498295

8 years agoAllow creation of new contacts when picking.
Ben Komalo [Fri, 21 Jan 2011 19:15:49 +0000]
Allow creation of new contacts when picking.

Bug: 3377048
Change-Id: I9f819bc6c3fa4111d0f5a510d8e2693f71c85e33

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