OSDN Git Service

android-x86/packages-apps-Contacts.git
14 years agoam 893806ca: am 22184bba: Merge change If143a45c into eclair
Mike Cleron [Thu, 1 Oct 2009 18:53:53 +0000 (11:53 -0700)]
am 893806ca: am 22184bba: Merge change If143a45c into eclair

Merge commit '893806ca320bf229d75622f5e04529f93d21d750'

* commit '893806ca320bf229d75622f5e04529f93d21d750':
  Newer icons

14 years agoam a65c4ba0: am 3fb6f9a7: Merge change I386dd954 into eclair
Costin Manolache [Thu, 1 Oct 2009 18:50:44 +0000 (11:50 -0700)]
am a65c4ba0: am 3fb6f9a7: Merge change I386dd954 into eclair

Merge commit 'a65c4ba0786ac026007d6755d5eee16591b2939d'

* commit 'a65c4ba0786ac026007d6755d5eee16591b2939d':
  Remove GAIA string

14 years agoam 7a301f14: am 61d58bdf: Merge change Ibb6bf6b8 into eclair
Nicolas Catania [Thu, 1 Oct 2009 18:49:13 +0000 (11:49 -0700)]
am 7a301f14: am 61d58bdf: Merge change Ibb6bf6b8 into eclair

Merge commit '7a301f14e0fae060e369000eb1c7d52b78b90c9a'

* commit '7a301f14e0fae060e369000eb1c7d52b78b90c9a':
  Minor cosmetic cleanups.

14 years agoam 93278404: am 7bf296f1: [Issue 2097049] Adding a collapsed "Show all contacts"...
Dmitri Plotnikov [Thu, 1 Oct 2009 18:48:44 +0000 (11:48 -0700)]
am 93278404: am 7bf296f1: [Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion list

Merge commit '93278404467b1701dcfb734b810577ab34d65683'

* commit '93278404467b1701dcfb734b810577ab34d65683':
  [Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion list

14 years agoam 16964a0f: am c9d8f562: Merge change Ic0c20625 into eclair
Neel Parekh [Thu, 1 Oct 2009 18:45:01 +0000 (11:45 -0700)]
am 16964a0f: am c9d8f562: Merge change Ic0c20625 into eclair

Merge commit '16964a0f1b75fc36727428fce12e2292bab30769'

* commit '16964a0f1b75fc36727428fce12e2292bab30769':
  Don't hightlight call button in lists.

14 years agoam f5586c77: am 2da3ee5a: Merge change I53f94fc2 into eclair
Nicolas Catania [Thu, 1 Oct 2009 18:44:57 +0000 (11:44 -0700)]
am f5586c77: am 2da3ee5a: Merge change I53f94fc2 into eclair

Merge commit 'f5586c77b0f393f46462aa3b59cff540ffb90213'

* commit 'f5586c77b0f393f46462aa3b59cff540ffb90213':
  Tweaked the dialer screen to match the designer's PPL.

14 years agoam 7d715ef6: am a5cfca3f: [Issue 2097049] Updating the header of contact join screen...
Dmitri Plotnikov [Thu, 1 Oct 2009 18:44:53 +0000 (11:44 -0700)]
am 7d715ef6: am a5cfca3f: [Issue 2097049] Updating the header of contact join screen - new icon and text

Merge commit '7d715ef6234b6981062550a348a87e05bc56d066'

* commit '7d715ef6234b6981062550a348a87e05bc56d066':
  [Issue 2097049] Updating the header of contact join screen - new icon and text

14 years agoam d61a831e: am 4f56df3c: Added source label name to account name hsection.
Tadashi G. Takaoka [Thu, 1 Oct 2009 18:43:53 +0000 (11:43 -0700)]
am d61a831e: am 4f56df3c: Added source label name to account name hsection.

Merge commit 'd61a831ef05076e4cfab6006742474ba857772a4'

* commit 'd61a831ef05076e4cfab6006742474ba857772a4':
  Added source label name to account name hsection.

14 years agoam 17af6cac: am b4a7298b: Make tab widget contain account name text view to avoid...
Tadashi G. Takaoka [Thu, 1 Oct 2009 18:43:26 +0000 (11:43 -0700)]
am 17af6cac: am b4a7298b: Make tab widget contain account name text view to avoid animation glitch

Merge commit '17af6cac938cd879ad29a259107975168f629173'

* commit '17af6cac938cd879ad29a259107975168f629173':
  Make tab widget contain account name text view to avoid animation glitch

14 years agoam 73122be0: am 03a00e6f: Merge change Iefb766ce into eclair
Dmitri Plotnikov [Thu, 1 Oct 2009 18:41:20 +0000 (11:41 -0700)]
am 73122be0: am 03a00e6f: Merge change Iefb766ce into eclair

Merge commit '73122be052d1d9021bf08123f6ce93f23bf5798c'

* commit '73122be052d1d9021bf08123f6ce93f23bf5798c':
  [Issue 2155068] Fixing the selection clause for legacy API request in EditContactActivity

14 years agoam 13b68c23: am de37a8db: Restrict data shown in picker based on calling activity.
Evan Millar [Thu, 1 Oct 2009 18:41:05 +0000 (11:41 -0700)]
am 13b68c23: am de37a8db: Restrict data shown in picker based on calling activity.

Merge commit '13b68c2370c51467f36ffcc3b4c7c7d98e6cf220'

* commit '13b68c2370c51467f36ffcc3b4c7c7d98e6cf220':
  Restrict data shown in picker based on calling activity.

14 years agoam 8b896f37: am d0610ca5: Make total contacts header more like a separator.
Neel Parekh [Thu, 1 Oct 2009 18:36:28 +0000 (11:36 -0700)]
am 8b896f37: am d0610ca5: Make total contacts header more like a separator.

Merge commit '8b896f37ae4cbb6f2ccd9a4ea0a213f19be6532f'

* commit '8b896f37ae4cbb6f2ccd9a4ea0a213f19be6532f':
  Make total contacts header more like a separator.

14 years agoam 785dc108: am e6b5b3e6: [Issue 2149076] More wording cleanup on contacts Display...
Dmitri Plotnikov [Thu, 1 Oct 2009 18:36:24 +0000 (11:36 -0700)]
am 785dc108: am e6b5b3e6: [Issue 2149076] More wording cleanup on contacts Display Options

Merge commit '785dc10836358efdb029a0aba6e09112c551d212'

* commit '785dc10836358efdb029a0aba6e09112c551d212':
  [Issue 2149076] More wording cleanup on contacts Display Options

14 years agoam 88617950: am 3f1694e4: Merge change I394867d3 into eclair
Nicolas Catania [Thu, 1 Oct 2009 18:35:00 +0000 (11:35 -0700)]
am 88617950: am 3f1694e4: Merge change I394867d3 into eclair

Merge commit '886179507ec1caae03b5f36929edc98805de82ab'

* commit '886179507ec1caae03b5f36929edc98805de82ab':
  Cancel the selection and move the cursor pass the wait/pause symbol.

14 years agoam eac79824: am 0020b6ad: Fix Contacts app so that it is able to use import feature!!!
Daisuke Miyakawa [Thu, 1 Oct 2009 18:19:13 +0000 (11:19 -0700)]
am eac79824: am 0020b6ad: Fix Contacts app so that it is able to use import feature!!!

Merge commit 'eac79824e67901493f97e170a416a22ce84042fb'

* commit 'eac79824e67901493f97e170a416a22ce84042fb':
  Fix Contacts app so that it is able to use import feature!!!

14 years agoam b1992f8f: am d746d0fd: Merge change Ibb10a3d9 into eclair
Dmitri Plotnikov [Thu, 1 Oct 2009 18:17:55 +0000 (11:17 -0700)]
am b1992f8f: am d746d0fd: Merge change Ibb10a3d9 into eclair

Merge commit 'b1992f8fb92f6eb9b932163cf58507ff4142c694'

* commit 'b1992f8fb92f6eb9b932163cf58507ff4142c694':
  [Issue 2149076] Wording cleanup on contacts Display Options

14 years agoam 586a0f45: am 251d6310: Merge change Ice18ecc3 into eclair
Evan Millar [Thu, 1 Oct 2009 18:15:31 +0000 (11:15 -0700)]
am 586a0f45: am 251d6310: Merge change Ice18ecc3 into eclair

Merge commit '586a0f45fafa665b9a8b18c602529fc9cd035e92'

* commit '586a0f45fafa665b9a8b18c602529fc9cd035e92':
  Fix collapsing to do fuzzy phone number matching.

14 years agoam 3286f43d: am 57a26d50: Do not show "star" in contact editor.
Tadashi G. Takaoka [Thu, 1 Oct 2009 18:14:27 +0000 (11:14 -0700)]
am 3286f43d: am 57a26d50: Do not show "star" in contact editor.

Merge commit '3286f43d46a16c013b42e4f465c2228034a8aa63'

* commit '3286f43d46a16c013b42e4f465c2228034a8aa63':
  Do not show "star" in contact editor.

14 years agoam a1db2af7: am 1dba2b82: Merge change I1dd85cfe into eclair
Mike Cleron [Thu, 1 Oct 2009 18:11:00 +0000 (11:11 -0700)]
am a1db2af7: am 1dba2b82: Merge change I1dd85cfe into eclair

Merge commit 'a1db2af76130c5e8a1f2c14adce68cb5eeff7044'

* commit 'a1db2af76130c5e8a1f2c14adce68cb5eeff7044':
  New icons

14 years agoam 6775f618: am 57d27da9: [Issue 2097049] Adding a header to Contact Join UI
Dmitri Plotnikov [Thu, 1 Oct 2009 18:10:12 +0000 (11:10 -0700)]
am 6775f618: am 57d27da9: [Issue 2097049] Adding a header to Contact Join UI

Merge commit '6775f618a296e827c755bb24142e55f1f1fed77d'

* commit '6775f618a296e827c755bb24142e55f1f1fed77d':
  [Issue 2097049] Adding a header to Contact Join UI

14 years agoam 8864855c: am 9108dad3: Merge change Ibcade31c into eclair
Dmitri Plotnikov [Thu, 1 Oct 2009 18:09:14 +0000 (11:09 -0700)]
am 8864855c: am 9108dad3: Merge change Ibcade31c into eclair

Merge commit '8864855c4913c5a2f0eb93a1c1c0a24dee16af0f'

* commit '8864855c4913c5a2f0eb93a1c1c0a24dee16af0f':
  [Issue 2147295] Only showing visible contacts in contact Join UI

14 years agoam e7427b50: am 3649fd86: Remove TYPE_CUSTOM from EAS source.
Jeff Sharkey [Thu, 1 Oct 2009 18:07:25 +0000 (11:07 -0700)]
am e7427b50: am 3649fd86: Remove TYPE_CUSTOM from EAS source.

Merge commit 'e7427b50eb246e9ffe3a545cf13155c5036f76d5'

* commit 'e7427b50eb246e9ffe3a545cf13155c5036f76d5':
  Remove TYPE_CUSTOM from EAS source.

14 years agoam 87c6c2b4: am ae8e5769: Merge change I60a8f5d0 into eclair
Megha Joshi [Thu, 1 Oct 2009 18:06:48 +0000 (11:06 -0700)]
am 87c6c2b4: am ae8e5769: Merge change I60a8f5d0 into eclair

Merge commit '87c6c2b4cc0e7f38c10de44b3361b6a8b02d45aa'

* commit '87c6c2b4cc0e7f38c10de44b3361b6a8b02d45aa':
  Disable labels, fields and add button for readonly

14 years agoam 22184bba: Merge change If143a45c into eclair
Mike Cleron [Wed, 30 Sep 2009 08:35:56 +0000 (01:35 -0700)]
am 22184bba: Merge change If143a45c into eclair

Merge commit '22184bba4d37f6a1baf11089ac3b3fad849d7b4e' into eclair-plus-aosp

* commit '22184bba4d37f6a1baf11089ac3b3fad849d7b4e':
  Newer icons

14 years agoMerge change If143a45c into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 08:30:30 +0000 (04:30 -0400)]
Merge change If143a45c into eclair

* changes:
  Newer icons

14 years agoNewer icons
Mike Cleron [Wed, 30 Sep 2009 08:13:23 +0000 (01:13 -0700)]
Newer icons

14 years agoam 3fb6f9a7: Merge change I386dd954 into eclair
Costin Manolache [Wed, 30 Sep 2009 05:53:01 +0000 (22:53 -0700)]
am 3fb6f9a7: Merge change I386dd954 into eclair

Merge commit '3fb6f9a7e061b34a0cb29298c15c0f1c4838ca15' into eclair-plus-aosp

* commit '3fb6f9a7e061b34a0cb29298c15c0f1c4838ca15':
  Remove GAIA string

14 years agoMerge change I386dd954 into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 05:44:13 +0000 (01:44 -0400)]
Merge change I386dd954 into eclair

* changes:
  Remove GAIA string

14 years agoam 61d58bdf: Merge change Ibb6bf6b8 into eclair
Nicolas Catania [Wed, 30 Sep 2009 04:49:52 +0000 (21:49 -0700)]
am 61d58bdf: Merge change Ibb6bf6b8 into eclair

Merge commit '61d58bdf80b3a66fe9afc0777e903d4c3059d6b5' into eclair-plus-aosp

* commit '61d58bdf80b3a66fe9afc0777e903d4c3059d6b5':
  Minor cosmetic cleanups.

14 years agoMerge change Ibb6bf6b8 into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 04:42:08 +0000 (00:42 -0400)]
Merge change Ibb6bf6b8 into eclair

* changes:
  Minor cosmetic cleanups.

14 years agoam 7bf296f1: [Issue 2097049] Adding a collapsed "Show all contacts" item to the join...
Dmitri Plotnikov [Wed, 30 Sep 2009 04:30:34 +0000 (21:30 -0700)]
am 7bf296f1: [Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion list

Merge commit '7bf296f1d3a7e0bc4d1f47241a5de66454a13403' into eclair-plus-aosp

* commit '7bf296f1d3a7e0bc4d1f47241a5de66454a13403':
  [Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion list

14 years ago[Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion...
Dmitri Plotnikov [Wed, 30 Sep 2009 04:01:25 +0000 (21:01 -0700)]
[Issue 2097049] Adding a collapsed "Show all contacts" item to the join suggestion list

Change-Id: I7cf12800b942720d00229d6c61ba6180f4cd87d4

14 years agoMinor cosmetic cleanups.
Nicolas Catania [Wed, 30 Sep 2009 03:28:01 +0000 (20:28 -0700)]
Minor cosmetic cleanups.

14 years agoRemove GAIA string
Costin Manolache [Wed, 30 Sep 2009 01:58:41 +0000 (18:58 -0700)]
Remove GAIA string

14 years agoam c9d8f562: Merge change Ic0c20625 into eclair
Neel Parekh [Wed, 30 Sep 2009 01:22:54 +0000 (18:22 -0700)]
am c9d8f562: Merge change Ic0c20625 into eclair

Merge commit 'c9d8f5626230c9a034df315e09f3cab10cd3f267' into eclair-plus-aosp

* commit 'c9d8f5626230c9a034df315e09f3cab10cd3f267':
  Don't hightlight call button in lists.

14 years agoam 2da3ee5a: Merge change I53f94fc2 into eclair
Nicolas Catania [Wed, 30 Sep 2009 01:20:26 +0000 (18:20 -0700)]
am 2da3ee5a: Merge change I53f94fc2 into eclair

Merge commit '2da3ee5adb99df903339bd6b6b4812bd34f9cac7' into eclair-plus-aosp

* commit '2da3ee5adb99df903339bd6b6b4812bd34f9cac7':
  Tweaked the dialer screen to match the designer's PPL.

14 years agoam a5cfca3f: [Issue 2097049] Updating the header of contact join screen - new icon...
Dmitri Plotnikov [Wed, 30 Sep 2009 01:20:22 +0000 (18:20 -0700)]
am a5cfca3f: [Issue 2097049] Updating the header of contact join screen - new icon and text

Merge commit 'a5cfca3f998fb6c646092aa8b6ff9c8f13b8a781' into eclair-plus-aosp

* commit 'a5cfca3f998fb6c646092aa8b6ff9c8f13b8a781':
  [Issue 2097049] Updating the header of contact join screen - new icon and text

14 years agoMerge change Ic0c20625 into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 01:15:33 +0000 (21:15 -0400)]
Merge change Ic0c20625 into eclair

* changes:
  Don't hightlight call button in lists.

14 years agoMerge change I53f94fc2 into eclair
Android (Google) Code Review [Wed, 30 Sep 2009 01:14:22 +0000 (21:14 -0400)]
Merge change I53f94fc2 into eclair

* changes:
  Tweaked the dialer screen to match the designer's PPL.

14 years ago[Issue 2097049] Updating the header of contact join screen - new icon and text
Dmitri Plotnikov [Wed, 30 Sep 2009 01:13:08 +0000 (18:13 -0700)]
[Issue 2097049] Updating the header of contact join screen - new icon and text

Change-Id: Ib780fba650dad0e070eabce497dde3ffa75661f5

14 years agoam 4f56df3c: Added source label name to account name hsection.
Tadashi G. Takaoka [Wed, 30 Sep 2009 00:56:10 +0000 (17:56 -0700)]
am 4f56df3c: Added source label name to account name hsection.

Merge commit '4f56df3c7fd35bd268f24a2e0404f18a451a5a56' into eclair-plus-aosp

* commit '4f56df3c7fd35bd268f24a2e0404f18a451a5a56':
  Added source label name to account name hsection.

14 years agoam b4a7298b: Make tab widget contain account name text view to avoid animation glitch
Tadashi G. Takaoka [Wed, 30 Sep 2009 00:36:34 +0000 (17:36 -0700)]
am b4a7298b: Make tab widget contain account name text view to avoid animation glitch

Merge commit 'b4a7298b882999372b9a44415c1387ee49fba323' into eclair-plus-aosp

* commit 'b4a7298b882999372b9a44415c1387ee49fba323':
  Make tab widget contain account name text view to avoid animation glitch

14 years agoAdded source label name to account name hsection.
Tadashi G. Takaoka [Tue, 29 Sep 2009 23:04:08 +0000 (16:04 -0700)]
Added source label name to account name hsection.

Internal Bug: 2154925

14 years agoMake tab widget contain account name text view to avoid animation glitch
Tadashi G. Takaoka [Tue, 29 Sep 2009 20:08:28 +0000 (13:08 -0700)]
Make tab widget contain account name text view to avoid animation glitch

Internal Bug: 2153912

14 years agoam 03a00e6f: Merge change Iefb766ce into eclair
Dmitri Plotnikov [Tue, 29 Sep 2009 23:09:21 +0000 (16:09 -0700)]
am 03a00e6f: Merge change Iefb766ce into eclair

Merge commit '03a00e6fee304af3451f02903e7f7538475b6d2c' into eclair-plus-aosp

* commit '03a00e6fee304af3451f02903e7f7538475b6d2c':
  [Issue 2155068] Fixing the selection clause for legacy API request in EditContactActivity

14 years agoMerge change Iefb766ce into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 23:03:45 +0000 (19:03 -0400)]
Merge change Iefb766ce into eclair

* changes:
  [Issue 2155068] Fixing the selection clause for legacy API request in EditContactActivity

14 years ago[Issue 2155068] Fixing the selection clause for legacy API request in EditContactActivity
Dmitri Plotnikov [Tue, 29 Sep 2009 23:02:54 +0000 (16:02 -0700)]
[Issue 2155068] Fixing the selection clause for legacy API request in EditContactActivity

Change-Id: Iefb766ce73baf707cfd74f66627cf8fc4fb70249

14 years agoam de37a8db: Restrict data shown in picker based on calling activity.
Evan Millar [Tue, 29 Sep 2009 23:01:27 +0000 (16:01 -0700)]
am de37a8db: Restrict data shown in picker based on calling activity.

Merge commit 'de37a8db58613ba6183c3c2b5987dcf9e16e9e22' into eclair-plus-aosp

* commit 'de37a8db58613ba6183c3c2b5987dcf9e16e9e22':
  Restrict data shown in picker based on calling activity.

14 years agoRestrict data shown in picker based on calling activity.
Evan Millar [Tue, 29 Sep 2009 16:33:51 +0000 (09:33 -0700)]
Restrict data shown in picker based on calling activity.

Change-Id: I07be295b05f272c268019817732f6d98953bc3fd

14 years agoam d0610ca5: Make total contacts header more like a separator.
Neel Parekh [Tue, 29 Sep 2009 21:16:46 +0000 (14:16 -0700)]
am d0610ca5: Make total contacts header more like a separator.

Merge commit 'd0610ca54e4f9df59ac652c206c2daaba1b2d3dd' into eclair-plus-aosp

* commit 'd0610ca54e4f9df59ac652c206c2daaba1b2d3dd':
  Make total contacts header more like a separator.

14 years agoam e6b5b3e6: [Issue 2149076] More wording cleanup on contacts Display Options
Dmitri Plotnikov [Tue, 29 Sep 2009 21:16:38 +0000 (14:16 -0700)]
am e6b5b3e6: [Issue 2149076] More wording cleanup on contacts Display Options

Merge commit 'e6b5b3e60dd06c316745d4d9d9ced241a743b6a4' into eclair-plus-aosp

* commit 'e6b5b3e60dd06c316745d4d9d9ced241a743b6a4':
  [Issue 2149076] More wording cleanup on contacts Display Options

14 years agoMake total contacts header more like a separator.
Neel Parekh [Tue, 29 Sep 2009 19:33:19 +0000 (12:33 -0700)]
Make total contacts header more like a separator.

14 years ago[Issue 2149076] More wording cleanup on contacts Display Options
Dmitri Plotnikov [Tue, 29 Sep 2009 21:07:19 +0000 (14:07 -0700)]
[Issue 2149076] More wording cleanup on contacts Display Options

Change-Id: I8ec4e7ab63387fffa6f32063776176e8dbcff600

14 years agoam 3f1694e4: Merge change I394867d3 into eclair
Nicolas Catania [Tue, 29 Sep 2009 20:32:01 +0000 (13:32 -0700)]
am 3f1694e4: Merge change I394867d3 into eclair

Merge commit '3f1694e47e3b9db19ab77fa9956a5500e6df94eb' into eclair-plus-aosp

* commit '3f1694e47e3b9db19ab77fa9956a5500e6df94eb':
  Cancel the selection and move the cursor pass the wait/pause symbol.

14 years agoMerge change I394867d3 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 20:25:15 +0000 (16:25 -0400)]
Merge change I394867d3 into eclair

* changes:
  Cancel the selection and move the cursor pass the wait/pause symbol.

14 years agoTweaked the dialer screen to match the designer's PPL.
Nicolas Catania [Tue, 29 Sep 2009 06:03:33 +0000 (23:03 -0700)]
Tweaked the dialer screen to match the designer's PPL.

Created a layout-long-finger version of the dialpad for wvga devices.
For these devices, the buttons are taller than for hvga and
the margin around the elements are also different.

Extracted the bar with the 3 buttons in a separate file that gets
included in both portrait and landscape modes.

Simplified the ButtonGridLayout. Now runs 6% faster (3 runs w/ traceview).
I hardcoded the size of the button grid because the number of columns was
already hardcoded, so why not fix everything?
Use some member to cache the calculation made during onMeasure to be reused
in onLayout.

Tested on dream and sh.... in portrait and landscape modes.

Bug:2104523

14 years agoam 0020b6ad: Fix Contacts app so that it is able to use import feature!!!
Daisuke Miyakawa [Tue, 29 Sep 2009 19:27:03 +0000 (12:27 -0700)]
am 0020b6ad: Fix Contacts app so that it is able to use import feature!!!

Merge commit '0020b6ad8c40f976d18e69ac1d37a1bf94e8b5fb' into eclair-plus-aosp

* commit '0020b6ad8c40f976d18e69ac1d37a1bf94e8b5fb':
  Fix Contacts app so that it is able to use import feature!!!

14 years agoFix Contacts app so that it is able to use import feature!!!
Daisuke Miyakawa [Tue, 29 Sep 2009 19:20:39 +0000 (12:20 -0700)]
Fix Contacts app so that it is able to use import feature!!!

14 years agoam d746d0fd: Merge change Ibb10a3d9 into eclair
Dmitri Plotnikov [Tue, 29 Sep 2009 19:11:38 +0000 (12:11 -0700)]
am d746d0fd: Merge change Ibb10a3d9 into eclair

Merge commit 'd746d0fd706fe9b603a05bc5ed840bb34bf7879c' into eclair-plus-aosp

* commit 'd746d0fd706fe9b603a05bc5ed840bb34bf7879c':
  [Issue 2149076] Wording cleanup on contacts Display Options

14 years agoMerge change Ibb10a3d9 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 19:05:07 +0000 (15:05 -0400)]
Merge change Ibb10a3d9 into eclair

* changes:
  [Issue 2149076] Wording cleanup on contacts Display Options

14 years ago[Issue 2149076] Wording cleanup on contacts Display Options
Dmitri Plotnikov [Tue, 29 Sep 2009 19:04:28 +0000 (12:04 -0700)]
[Issue 2149076] Wording cleanup on contacts Display Options

Change-Id: Ibb10a3d9a7735d3bb3005aa188cf43877cc955f1

14 years agoam 5d920ba5: am 99b1db73: Invalidate sources cache when accounts change.
Jeff Sharkey [Tue, 29 Sep 2009 18:14:17 +0000 (11:14 -0700)]
am 5d920ba5: am 99b1db73: Invalidate sources cache when accounts change.

Merge commit '5d920ba5e32686b4a376845e32387ce07e71536e'

* commit '5d920ba5e32686b4a376845e32387ce07e71536e':
  Invalidate sources cache when accounts change.

14 years agoam 12fc43c2: am 2148e6bd: Merge change I3aaf0497 into eclair
Neel Parekh [Tue, 29 Sep 2009 18:14:03 +0000 (11:14 -0700)]
am 12fc43c2: am 2148e6bd: Merge change I3aaf0497 into eclair

Merge commit '12fc43c24ad73c53a58ff01a9e056225418f3a21'

* commit '12fc43c24ad73c53a58ff01a9e056225418f3a21':
  Show a header containing the total number of contacts.

14 years agoam bcd3b9db: am 93049319: Use separate API when sending vCard through ACTION_SEND.
Jeff Sharkey [Tue, 29 Sep 2009 18:13:54 +0000 (11:13 -0700)]
am bcd3b9db: am 93049319: Use separate API when sending vCard through ACTION_SEND.

Merge commit 'bcd3b9dba07e9b02d51ed20dd85c9829f0344ec4'

* commit 'bcd3b9dba07e9b02d51ed20dd85c9829f0344ec4':
  Use separate API when sending vCard through ACTION_SEND.

14 years agoam 055d66f0: am 33aa1c6b: Contacts: added source account name to view/edit activity.
Tadashi G. Takaoka [Tue, 29 Sep 2009 18:13:32 +0000 (11:13 -0700)]
am 055d66f0: am 33aa1c6b: Contacts: added source account name to view/edit activity.

Merge commit '055d66f069807ed8729a65707e795dc4a10e1bd6'

* commit '055d66f069807ed8729a65707e795dc4a10e1bd6':
  Contacts: added source account name to view/edit activity.

14 years agoam e7e6ea07: am 5b835898: Merge change I778df15f into eclair
Neel Parekh [Tue, 29 Sep 2009 18:13:29 +0000 (11:13 -0700)]
am e7e6ea07: am 5b835898: Merge change I778df15f into eclair

Merge commit 'e7e6ea0734c9db23d4eadae54777b50c6ba07d25'

* commit 'e7e6ea0734c9db23d4eadae54777b50c6ba07d25':
  Create a title on long press in view contact

14 years agoam a9233449: am e22b5343: Merge change Ifcd23efc into eclair
Megha Joshi [Tue, 29 Sep 2009 18:11:24 +0000 (11:11 -0700)]
am a9233449: am e22b5343: Merge change Ifcd23efc into eclair

Merge commit 'a92334496d572b418e2a9c45b5d06bd3f457631a'

* commit 'a92334496d572b418e2a9c45b5d06bd3f457631a':
  Prevents empty contacts from being saved.

14 years agoam da06e422: am d5e520a1: display text "no matching contacts found" if none found...
Vasu Nori [Tue, 29 Sep 2009 18:10:15 +0000 (11:10 -0700)]
am da06e422: am d5e520a1: display text "no matching contacts found" if none found while searching contacts

Merge commit 'da06e422e2deff51eb0881f1747f6ac5be1827a8'

* commit 'da06e422e2deff51eb0881f1747f6ac5be1827a8':
  display text "no matching contacts found" if none found while searching contacts

14 years agoam 251d6310: Merge change Ice18ecc3 into eclair
Evan Millar [Tue, 29 Sep 2009 17:49:05 +0000 (10:49 -0700)]
am 251d6310: Merge change Ice18ecc3 into eclair

Merge commit '251d63102b1e8056d96e1bb277a4c3640d1944a3' into eclair-plus-aosp

* commit '251d63102b1e8056d96e1bb277a4c3640d1944a3':
  Fix collapsing to do fuzzy phone number matching.

14 years agoMerge change Ice18ecc3 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 17:43:33 +0000 (13:43 -0400)]
Merge change Ice18ecc3 into eclair

* changes:
  Fix collapsing to do fuzzy phone number matching.

14 years agoam 57a26d50: Do not show "star" in contact editor.
Tadashi G. Takaoka [Tue, 29 Sep 2009 17:19:05 +0000 (10:19 -0700)]
am 57a26d50: Do not show "star" in contact editor.

Merge commit '57a26d500989bd1ff95f015457deae90a78964fa' into eclair-plus-aosp

* commit '57a26d500989bd1ff95f015457deae90a78964fa':
  Do not show "star" in contact editor.

14 years agoDo not show "star" in contact editor.
Tadashi G. Takaoka [Tue, 29 Sep 2009 16:12:46 +0000 (09:12 -0700)]
Do not show "star" in contact editor.

Internal Bug: 2147622

14 years agoFix collapsing to do fuzzy phone number matching.
Evan Millar [Tue, 29 Sep 2009 00:20:50 +0000 (17:20 -0700)]
Fix collapsing to do fuzzy phone number matching.

-Also use Collapser to collapse the numbers shown in the context menu
from the A-Z list.

Fixes http://b/issue?id=2047514 and http://b/issue?id=2144616

Change-Id: Ice18ecc306c2f30fd1525418bc9f7408c4435a50

14 years agoam 1dba2b82: Merge change I1dd85cfe into eclair
Mike Cleron [Tue, 29 Sep 2009 07:10:55 +0000 (00:10 -0700)]
am 1dba2b82: Merge change I1dd85cfe into eclair

Merge commit '1dba2b828306c823e1ffcc85b48e3941462d4176' into eclair-plus-aosp

* commit '1dba2b828306c823e1ffcc85b48e3941462d4176':
  New icons

14 years agoMerge change I1dd85cfe into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 07:05:08 +0000 (03:05 -0400)]
Merge change I1dd85cfe into eclair

* changes:
  New icons

14 years agoNew icons
Mike Cleron [Tue, 29 Sep 2009 07:03:17 +0000 (00:03 -0700)]
New icons

14 years agoam 57d27da9: [Issue 2097049] Adding a header to Contact Join UI
Dmitri Plotnikov [Tue, 29 Sep 2009 04:59:57 +0000 (21:59 -0700)]
am 57d27da9: [Issue 2097049] Adding a header to Contact Join UI

Merge commit '57d27da940983fba40d8e3a6d8b99a57b48419ea' into eclair-plus-aosp

* commit '57d27da940983fba40d8e3a6d8b99a57b48419ea':
  [Issue 2097049] Adding a header to Contact Join UI

14 years ago[Issue 2097049] Adding a header to Contact Join UI
Dmitri Plotnikov [Tue, 29 Sep 2009 01:06:11 +0000 (18:06 -0700)]
[Issue 2097049] Adding a header to Contact Join UI

Also fixing this bug:
java.lang.RuntimeException: Unable to stop activity {com.android.contacts/com.android.contacts.ContactsListActivity$JoinContactActivity}: java.lang.IllegalStateException: get field slot from row 0 col -1 failed

Change-Id: I74025ee687944282ea9fea945ce281e9a00f6fdc

14 years agoam 9108dad3: Merge change Ibcade31c into eclair
Dmitri Plotnikov [Tue, 29 Sep 2009 03:56:59 +0000 (20:56 -0700)]
am 9108dad3: Merge change Ibcade31c into eclair

Merge commit '9108dad3165459347a52684d91594bf7aca42339' into eclair-plus-aosp

* commit '9108dad3165459347a52684d91594bf7aca42339':
  [Issue 2147295] Only showing visible contacts in contact Join UI

14 years agoMerge change Ibcade31c into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 03:50:04 +0000 (23:50 -0400)]
Merge change Ibcade31c into eclair

* changes:
  [Issue 2147295] Only showing visible contacts in contact Join UI

14 years agoCancel the selection and move the cursor pass the wait/pause symbol.
Nicolas Catania [Tue, 29 Sep 2009 03:37:33 +0000 (20:37 -0700)]
Cancel the selection and move the cursor pass the wait/pause symbol.

When a selection is active and a special wait/pause charater is inserted,
it should replace the selection (currently done) but is should also
deselect the resulting area and move back to cursor positioned after
the inserted wait/pause character.

Bug:2150657

14 years ago[Issue 2147295] Only showing visible contacts in contact Join UI
Dmitri Plotnikov [Tue, 29 Sep 2009 03:40:13 +0000 (20:40 -0700)]
[Issue 2147295] Only showing visible contacts in contact Join UI

Change-Id: Ibcade31cdba388e9f3053662e2650c680fdb6806

14 years agoam 3649fd86: Remove TYPE_CUSTOM from EAS source.
Jeff Sharkey [Tue, 29 Sep 2009 03:23:04 +0000 (20:23 -0700)]
am 3649fd86: Remove TYPE_CUSTOM from EAS source.

Merge commit '3649fd86996bb8051ea0239863b3db3c0ccc3a92' into eclair-plus-aosp

* commit '3649fd86996bb8051ea0239863b3db3c0ccc3a92':
  Remove TYPE_CUSTOM from EAS source.

14 years agoRemove TYPE_CUSTOM from EAS source.
Jeff Sharkey [Tue, 29 Sep 2009 03:16:37 +0000 (20:16 -0700)]
Remove TYPE_CUSTOM from EAS source.

Helps fix http://b/2127721

14 years agoam ae8e5769: Merge change I60a8f5d0 into eclair
Megha Joshi [Tue, 29 Sep 2009 02:24:51 +0000 (19:24 -0700)]
am ae8e5769: Merge change I60a8f5d0 into eclair

Merge commit 'ae8e5769a19aecb877406b0df251e7bff5c3e398' into eclair-plus-aosp

* commit 'ae8e5769a19aecb877406b0df251e7bff5c3e398':
  Disable labels, fields and add button for readonly

14 years agoMerge change I60a8f5d0 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 02:20:44 +0000 (22:20 -0400)]
Merge change I60a8f5d0 into eclair

* changes:
  Disable labels, fields and add button for readonly contacts in edit contact view.

14 years agoam 99b1db73: Invalidate sources cache when accounts change.
Jeff Sharkey [Tue, 29 Sep 2009 00:59:40 +0000 (17:59 -0700)]
am 99b1db73: Invalidate sources cache when accounts change.

Merge commit '99b1db73e9db33aa76883a7f60feafbc38e2860a' into eclair-plus-aosp

* commit '99b1db73e9db33aa76883a7f60feafbc38e2860a':
  Invalidate sources cache when accounts change.

14 years agoam 2148e6bd: Merge change I3aaf0497 into eclair
Neel Parekh [Tue, 29 Sep 2009 00:59:36 +0000 (17:59 -0700)]
am 2148e6bd: Merge change I3aaf0497 into eclair

Merge commit '2148e6bd088c5c82ee01d78a9f854e8be85cc81c' into eclair-plus-aosp

* commit '2148e6bd088c5c82ee01d78a9f854e8be85cc81c':
  Show a header containing the total number of contacts.

14 years agoInvalidate sources cache when accounts change.
Jeff Sharkey [Mon, 28 Sep 2009 01:21:04 +0000 (18:21 -0700)]
Invalidate sources cache when accounts change.

This change listens for AccountManager changes, such as
when an account is added.  Fixes http://b/2115977

14 years agoam 93049319: Use separate API when sending vCard through ACTION_SEND.
Jeff Sharkey [Tue, 29 Sep 2009 00:54:26 +0000 (17:54 -0700)]
am 93049319: Use separate API when sending vCard through ACTION_SEND.

Merge commit '930493194bb31878c529f0f630d8854d4eb38727' into eclair-plus-aosp

* commit '930493194bb31878c529f0f630d8854d4eb38727':
  Use separate API when sending vCard through ACTION_SEND.

14 years agoMerge change I3aaf0497 into eclair
Android (Google) Code Review [Tue, 29 Sep 2009 00:54:07 +0000 (20:54 -0400)]
Merge change I3aaf0497 into eclair

* changes:
  Show a header containing the total number of contacts.

14 years agoShow a header containing the total number of contacts.
Neel Parekh [Tue, 29 Sep 2009 00:19:03 +0000 (17:19 -0700)]
Show a header containing the total number of contacts.

Bug: 2138779

14 years agoam 33aa1c6b: Contacts: added source account name to view/edit activity.
Tadashi G. Takaoka [Tue, 29 Sep 2009 00:24:42 +0000 (17:24 -0700)]
am 33aa1c6b: Contacts: added source account name to view/edit activity.

Merge commit '33aa1c6b1bc7e134f499bd7d2c9051c4f7da2992' into eclair-plus-aosp

* commit '33aa1c6b1bc7e134f499bd7d2c9051c4f7da2992':
  Contacts: added source account name to view/edit activity.

14 years agoam 5b835898: Merge change I778df15f into eclair
Neel Parekh [Tue, 29 Sep 2009 00:24:38 +0000 (17:24 -0700)]
am 5b835898: Merge change I778df15f into eclair

Merge commit '5b8358984f413d682dd89a9862bf306e5c1a159c' into eclair-plus-aosp

* commit '5b8358984f413d682dd89a9862bf306e5c1a159c':
  Create a title on long press in view contact

14 years agoDisable labels, fields and add button for readonly
Megha Joshi [Sun, 27 Sep 2009 02:05:57 +0000 (19:05 -0700)]
Disable labels, fields and add button for readonly
contacts in edit contact view.

Fixes 2139627.

14 years agoUse separate API when sending vCard through ACTION_SEND.
Jeff Sharkey [Mon, 28 Sep 2009 00:28:13 +0000 (17:28 -0700)]
Use separate API when sending vCard through ACTION_SEND.

Fixes http://b/2138790

14 years agoContacts: added source account name to view/edit activity.
Tadashi G. Takaoka [Sun, 27 Sep 2009 21:22:28 +0000 (14:22 -0700)]
Contacts: added source account name to view/edit activity.

Internal Bug: 2129158

14 years agoMerge change I778df15f into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 23:10:18 +0000 (19:10 -0400)]
Merge change I778df15f into eclair

* changes:
  Create a title on long press in view contact

14 years agoam e22b5343: Merge change Ifcd23efc into eclair
Megha Joshi [Mon, 28 Sep 2009 23:08:24 +0000 (16:08 -0700)]
am e22b5343: Merge change Ifcd23efc into eclair

Merge commit 'e22b53437835a904780682a2b97a67928c58db22' into eclair-plus-aosp

* commit 'e22b53437835a904780682a2b97a67928c58db22':
  Prevents empty contacts from being saved.

14 years agoMerge change Ifcd23efc into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 23:03:34 +0000 (19:03 -0400)]
Merge change Ifcd23efc into eclair

* changes:
  Prevents empty contacts from being saved.