OSDN Git Service
Evan Millar [Mon, 12 Oct 2009 18:12:45 +0000 (11:12 -0700)]
Daisuke Miyakawa [Mon, 12 Oct 2009 18:12:40 +0000 (11:12 -0700)]
am
5bc8b5ae: Fix ImportVCardActivity so that NPE will never occur during import.
Merge commit '
5bc8b5ae64650e1a62d0b676b34c3f150631c951'
* commit '
5bc8b5ae64650e1a62d0b676b34c3f150631c951':
Fix ImportVCardActivity so that NPE will never occur during import.
android-build SharedAccount [Wed, 7 Oct 2009 16:25:56 +0000 (09:25 -0700)]
The Android Open Source Project [Wed, 7 Oct 2009 16:25:52 +0000 (09:25 -0700)]
am
771d1471: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
771d147158b3fc3dc38b96167f44ad042e782741'
* commit '
771d147158b3fc3dc38b96167f44ad042e782741':
The Android Open Source Project [Wed, 7 Oct 2009 16:25:48 +0000 (09:25 -0700)]
am
d9e5e44b: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
d9e5e44be4fb75260b69027d5ef7a9cf0fe57a44'
* commit '
d9e5e44be4fb75260b69027d5ef7a9cf0fe57a44':
The Android Open Source Project [Wed, 7 Oct 2009 16:25:44 +0000 (09:25 -0700)]
am
26861585: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
26861585eabfe0578055e100b7a860fd8daeb59d'
* commit '
26861585eabfe0578055e100b7a860fd8daeb59d':
The Android Open Source Project [Wed, 7 Oct 2009 16:25:40 +0000 (09:25 -0700)]
am
22793dd0: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '
22793dd0319c5aa4f8f03e4cc2db36bf2ec8969c'
* commit '
22793dd0319c5aa4f8f03e4cc2db36bf2ec8969c':
android-build SharedAccount [Wed, 7 Oct 2009 16:25:36 +0000 (09:25 -0700)]
Evan Millar [Tue, 6 Oct 2009 17:08:16 +0000 (10:08 -0700)]
resolved conflicts for merge of
cf22feef to master
Evan Millar [Sun, 4 Oct 2009 22:12:41 +0000 (15:12 -0700)]
am
2fb3db55: Fix bug http://b/issue?id=
2160189
Merge commit '
2fb3db55d68ff8a8d9cf8e329de3ec8687d5ff29' into eclair-mr2
* commit '
2fb3db55d68ff8a8d9cf8e329de3ec8687d5ff29':
Fix bug http://b/issue?id=
2160189
Make ExporterVCardActivity appropriately cope with orientation change.
Daisuke Miyakawa [Fri, 2 Oct 2009 23:48:06 +0000 (16:48 -0700)]
Fix ImportVCardActivity so that NPE will never occur during import.
The NPE occurs only when the importing thread exits before the progress dialog is shown.
In theory (and in practice), this is rare, but anyway, this is a bug.
Internal issue number:
2164280
Daisuke Miyakawa [Thu, 1 Oct 2009 22:13:03 +0000 (15:13 -0700)]
am
8b211249: am
ced8b4ac: Make ExporterVCardActivity appropriately cope with orientation change.
Merge commit '
8b21124972a0a390441e2eb0b9857a4c2033921e'
* commit '
8b21124972a0a390441e2eb0b9857a4c2033921e':
Make ExporterVCardActivity appropriately cope with orientation change.
Jeff Hamilton [Thu, 1 Oct 2009 22:11:34 +0000 (15:11 -0700)]
am
b1ba019a: am
5297c6af: New edit UI, now without tabs.
Merge commit '
b1ba019a5f1ee35c2a23e5974bd6f03682fba03a'
* commit '
b1ba019a5f1ee35c2a23e5974bd6f03682fba03a':
New edit UI, now without tabs.
Jeff Sharkey [Thu, 1 Oct 2009 22:11:06 +0000 (15:11 -0700)]
am
a9eb17da: am
735e8b11: Single query with social, IM rows, heavy recycling, large.
Merge commit '
a9eb17da3c1060e2a0fc5d456bb8089609499864'
* commit '
a9eb17da3c1060e2a0fc5d456bb8089609499864':
Single query with social, IM rows, heavy recycling, large.
Android Git Automerger [Thu, 1 Oct 2009 22:03:36 +0000 (15:03 -0700)]
merge
2644e0f33eac0ab861657bddb824d007e1c6a2d1 except for the res/values-* translation files
Dmitri Plotnikov [Thu, 1 Oct 2009 20:56:43 +0000 (13:56 -0700)]
am
7f759ec3: am
21971cf9: Merge change I6f8ec24e into eclair
Merge commit '
7f759ec38671593680c47b7628b120d06f0b2636'
* commit '
7f759ec38671593680c47b7628b120d06f0b2636':
Refreshing view contact based on the result of editing
Mike Cleron [Thu, 1 Oct 2009 20:56:38 +0000 (13:56 -0700)]
Dmitri Plotnikov [Thu, 1 Oct 2009 20:56:34 +0000 (13:56 -0700)]
am
24d9a4de: am
5ac10562: Moving join contact functionality to the Contact Edit screen.
Merge commit '
24d9a4deee3a105609e6fabdcac21bb4f934581f'
* commit '
24d9a4deee3a105609e6fabdcac21bb4f934581f':
Moving join contact functionality to the Contact Edit screen.
Evan Millar [Thu, 1 Oct 2009 20:54:00 +0000 (13:54 -0700)]
am
39c5d7b8: am
512f4c18: Merge change I511ba352 into eclair
Merge commit '
39c5d7b88da0ba4a47e07a53c64284c14731975b'
* commit '
39c5d7b88da0ba4a47e07a53c64284c14731975b':
Remove tabs, join, and aggregate badge from ViewContactActivity
Mike Cleron [Thu, 1 Oct 2009 20:52:08 +0000 (13:52 -0700)]
Evan Millar [Thu, 1 Oct 2009 20:49:39 +0000 (13:49 -0700)]
am
e9163527: am
ad76e2f1: Merge change I8490c0ec into eclair
Merge commit '
e9163527b4e053026261c83a92f1193bb4bb31fa'
* commit '
e9163527b4e053026261c83a92f1193bb4bb31fa':
com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT
Fred Quintana [Thu, 1 Oct 2009 20:48:22 +0000 (13:48 -0700)]
Tadashi G. Takaoka [Thu, 1 Oct 2009 20:37:45 +0000 (13:37 -0700)]
am
f47a6174: am
8c732964: Merge change I2a7e4e10 into eclair
Merge commit '
f47a6174761083a3c667a4c10f48cf89c9475845'
* commit '
f47a6174761083a3c667a4c10f48cf89c9475845':
Make secondary edit entries unvisible if no data kind for it.
Android Git Automerger [Thu, 1 Oct 2009 20:22:29 +0000 (13:22 -0700)]
Evan Millar [Thu, 1 Oct 2009 20:00:53 +0000 (13:00 -0700)]
Fix bug http://b/issue?id=
2160189
Change-Id: I99f3aa5c159e999a2d2bd4526a4540e68af90d1d
Megha Joshi [Thu, 1 Oct 2009 19:45:28 +0000 (12:45 -0700)]
am
dea9b284: am
da13492d: Merge change I30d0cce2 into eclair
Merge commit '
dea9b28495a4c6a91c30178a503bf66460640d5b'
* commit '
dea9b28495a4c6a91c30178a503bf66460640d5b':
Add ContactsContract.CALLER_IS_SYNCADAPTER query parameter to the
Megha Joshi [Thu, 1 Oct 2009 19:45:24 +0000 (12:45 -0700)]
am
da27602b: am
d5afd8a1: Disable delete for read only contacts such as facebook contacts. Fixes bug
2121909.
Merge commit '
da27602baac5d16f411fd609d89515f386f38a77'
* commit '
da27602baac5d16f411fd609d89515f386f38a77':
Disable delete for read only contacts such as facebook contacts.
Dmitri Plotnikov [Thu, 1 Oct 2009 19:45:20 +0000 (12:45 -0700)]
am
f7d512d0: am
37beac4f: Merge change I1172406d into eclair
Merge commit '
f7d512d0c8d743a7079c6e87058072e1ac8f1889'
* commit '
f7d512d0c8d743a7079c6e87058072e1ac8f1889':
Moving contact split functionality to contact Edit
Evan Millar [Thu, 1 Oct 2009 19:45:17 +0000 (12:45 -0700)]
Evan Millar [Thu, 1 Oct 2009 19:23:05 +0000 (12:23 -0700)]
am
0607e463: am
7316bfd2: Merge change I5ba08ed2 into eclair
Merge commit '
0607e463bf80231481f9c74ed9da36f192f75b87'
* commit '
0607e463bf80231481f9c74ed9da36f192f75b87':
Final drop of hdpi assets for contacts.
Jeff Hamilton [Thu, 1 Oct 2009 19:20:29 +0000 (12:20 -0700)]
Neel Parekh [Thu, 1 Oct 2009 19:18:07 +0000 (12:18 -0700)]
am
9824a6d2: am
bdd3e583: Merge change I6f9a7185 into eclair
Merge commit '
9824a6d229cc359a346bb03b7b033493b34038c6'
* commit '
9824a6d229cc359a346bb03b7b033493b34038c6':
Fix the number off by one when typing in the contact list.
Megha Joshi [Thu, 1 Oct 2009 19:18:03 +0000 (12:18 -0700)]
am
70068c55: am
8ad339b4: Merge change I041d3933 into eclair
Merge commit '
70068c5587dc634b779dbf56980f86b1e849107c'
* commit '
70068c5587dc634b779dbf56980f86b1e849107c':
Add import export menu drawables.
Megha Joshi [Thu, 1 Oct 2009 19:18:00 +0000 (12:18 -0700)]
am
724e3f17: am
3c91b8ae: Merge change I6d074325 into eclair
Merge commit '
724e3f17641ba44e5445a440bb95be71072763cf'
* commit '
724e3f17641ba44e5445a440bb95be71072763cf':
Add FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET Intent flag to each of
Evan Millar [Thu, 1 Oct 2009 19:16:04 +0000 (12:16 -0700)]
am
bc9c0abd: am
c30e11cc: Merge change I1ad6f4ae into eclair
Merge commit '
bc9c0abdac2caf5f138fee7308276867388cd9aa'
* commit '
bc9c0abdac2caf5f138fee7308276867388cd9aa':
Use soft uris in ViewContactActivity and ContactOptionsActivity.
Neel Parekh [Thu, 1 Oct 2009 19:13:07 +0000 (12:13 -0700)]
am
e7722111: am
0803a707: Merge change Iaa0c610a into eclair
Merge commit '
e77221119072abb6c5bdc3dbc7131acb8b496d2e'
* commit '
e77221119072abb6c5bdc3dbc7131acb8b496d2e':
Hookup building the contact header widget from deltas.
Mike Cleron [Thu, 1 Oct 2009 19:13:03 +0000 (12:13 -0700)]
am
ff93a795: am
0e81dbd4: Merge change I623d3ba1 into eclair
Merge commit '
ff93a7954bdf86791d398668eef28f8eb949f7ae'
* commit '
ff93a7954bdf86791d398668eef28f8eb949f7ae':
Placeholder mdpi assets
Daisuke Miyakawa [Thu, 1 Oct 2009 19:12:04 +0000 (12:12 -0700)]
am
56f3e7fe: am
7370d42d: Merge change I0bb240dc into eclair
Merge commit '
56f3e7fe0374e58c75f254f93ae7ef252de0f1e0'
* commit '
56f3e7fe0374e58c75f254f93ae7ef252de0f1e0':
Fix a sample code commented out, complying with the new vCard implementation.
Evan Millar [Thu, 1 Oct 2009 18:59:28 +0000 (11:59 -0700)]
am
a1c92025: am
20e07eda: Adjust to FasttrackBadgeWidget->QuickContactBadge name change.
Merge commit '
a1c920258845138b428a65977402d94c13da25a5'
* commit '
a1c920258845138b428a65977402d94c13da25a5':
Adjust to FasttrackBadgeWidget->QuickContactBadge name change.
Daisuke Miyakawa [Thu, 1 Oct 2009 18:59:23 +0000 (11:59 -0700)]
Daisuke Miyakawa [Thu, 1 Oct 2009 18:58:46 +0000 (11:58 -0700)]
am
d860dac8: am
36966326: Fix error message shown when there\'s no vCard in SD card.
Merge commit '
d860dac89a1bf232ac522f090012bcd05cdb06ea'
* commit '
d860dac89a1bf232ac522f090012bcd05cdb06ea':
Fix error message shown when there's no vCard in SD card.
Tadashi G. Takaoka [Thu, 1 Oct 2009 18:57:23 +0000 (11:57 -0700)]
am
d2040b12: am
78ad85e5: Revert "Hide contact context from fast track window in the contacts view"
Merge commit '
d2040b12eafa6473b43f25421d50eea5825bbfc9'
* commit '
d2040b12eafa6473b43f25421d50eea5825bbfc9':
Revert "Hide contact context from fast track window in the contacts view"
Jeff Hamilton [Thu, 1 Oct 2009 18:54:43 +0000 (11:54 -0700)]
am
65890047: am
1306a67d: Don\'t pass the query parameter in if the calling package is null.
Merge commit '
6589004778365a55109922ce5e90adc440e687a0'
* commit '
6589004778365a55109922ce5e90adc440e687a0':
Don't pass the query parameter in if the calling package is null.
Mike Cleron [Thu, 1 Oct 2009 18:53:53 +0000 (11:53 -0700)]
Costin Manolache [Thu, 1 Oct 2009 18:50:44 +0000 (11:50 -0700)]
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.
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
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.
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.
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
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.
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
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
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.
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.
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
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.
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!!!
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
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.
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.
Mike Cleron [Thu, 1 Oct 2009 18:11:00 +0000 (11:11 -0700)]
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
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
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.
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
Daisuke Miyakawa [Thu, 1 Oct 2009 16:35:37 +0000 (09:35 -0700)]
am
ced8b4ac: Make ExporterVCardActivity appropriately cope with orientation change.
Merge commit '
ced8b4ac7054937e72deb47359eeb8d212539e98' into eclair-plus-aosp
* commit '
ced8b4ac7054937e72deb47359eeb8d212539e98':
Make ExporterVCardActivity appropriately cope with orientation change.
Daisuke Miyakawa [Thu, 1 Oct 2009 16:25:52 +0000 (09:25 -0700)]
Make ExporterVCardActivity appropriately cope with orientation change.
This was done when this class was VCardExporter and at that time the class
was not a separated Activity, but this time, ExporterVCardActivity itself
has to cope with that, but I forgot to modify it so.
Internal issue number:
2137469
android-build SharedAccount [Thu, 1 Oct 2009 15:43:43 +0000 (08:43 -0700)]
Merge commit 'goog/eclair' into eclair-release
Jeff Hamilton [Thu, 1 Oct 2009 12:49:14 +0000 (05:49 -0700)]
am
5297c6af: New edit UI, now without tabs.
Merge commit '
5297c6af41f3fd2f08cff5b84105af4efd1ab79f' into eclair-plus-aosp
* commit '
5297c6af41f3fd2f08cff5b84105af4efd1ab79f':
New edit UI, now without tabs.
Jeff Hamilton [Thu, 1 Oct 2009 09:22:33 +0000 (02:22 -0700)]
New edit UI, now without tabs.
Make ExternalSource derive from FallbackSource
and add photo and name to the list of sources
since they're not optional.
Change-Id: I043db076a001a711e56dd6e5e6ee32c4c0c9477a
Jeff Sharkey [Thu, 1 Oct 2009 12:06:29 +0000 (05:06 -0700)]
am
735e8b11: Single query with social, IM rows, heavy recycling, large.
Merge commit '
735e8b11d8e370f24e9b8ac5329a1985c879bbf2' into eclair-plus-aosp
* commit '
735e8b11d8e370f24e9b8ac5329a1985c879bbf2':
Single query with social, IM rows, heavy recycling, large.
Jeff Sharkey [Wed, 30 Sep 2009 21:57:07 +0000 (14:57 -0700)]
Single query with social, IM rows, heavy recycling, large.
Moved to a single query when showing FastTrack, instead of
previous three. This change also limits photos so we only
request when needed for large mode, and even then only the
super-primary photo. Helps fix http://b/
2134623
New query also brings in new social status API along with
attribution lines, fixing http://b/
2149038
Change also adds any IM rows under contact, or treats
Email entries with presence as Google Talk IM rows, which
fixes http://b/
2087402
When selecting chiclet icons, prefer a specific set of
built-in platform and system apps. This does /not/ replace
the system intent dialog to actually select an app when
there are multiple matches. Fixes http://b/
2139517
Heavy recycling strategies for preserving layouts. This
uses a ActivityManager trick to keep FastTrack pre-warmed
behind any other tasks. It also recycles inflated chiclets
between showings. With these and other optimizations, we
now show 60% faster. Fixes http://b/
2134623
Implements large FastTrack layout, fixing http://b/
2126683
Switched import/export icons to correct DPI, corrected HDPI
FastTrack shadow asset, and fixed dialog launching logic in
ContactsListView.
Dmitri Plotnikov [Thu, 1 Oct 2009 07:47:27 +0000 (00:47 -0700)]
am
21971cf9: Merge change I6f8ec24e into eclair
Merge commit '
21971cf96d1a93e428b4efd4d63014e9ce426c14' into eclair-plus-aosp
* commit '
21971cf96d1a93e428b4efd4d63014e9ce426c14':
Refreshing view contact based on the result of editing
Mike Cleron [Thu, 1 Oct 2009 07:47:24 +0000 (00:47 -0700)]
am
e987c10e: Merge change I457e2149 into eclair
Merge commit '
e987c10ebbe6d59e1cd3b3aeea8a41dfe43b9924' into eclair-plus-aosp
* commit '
e987c10ebbe6d59e1cd3b3aeea8a41dfe43b9924':
More icons
Dmitri Plotnikov [Thu, 1 Oct 2009 07:47:20 +0000 (00:47 -0700)]
am
5ac10562: Moving join contact functionality to the Contact Edit screen.
Merge commit '
5ac1056218bbaed2e4fb9ffffdbd14cdd46285c6' into eclair-plus-aosp
* commit '
5ac1056218bbaed2e4fb9ffffdbd14cdd46285c6':
Moving join contact functionality to the Contact Edit screen.
Android (Google) Code Review [Thu, 1 Oct 2009 07:43:28 +0000 (03:43 -0400)]
Merge change I6f8ec24e into eclair
* changes:
Refreshing view contact based on the result of editing
Android (Google) Code Review [Thu, 1 Oct 2009 07:37:57 +0000 (03:37 -0400)]
Merge change I457e2149 into eclair
* changes:
More icons
Mike Cleron [Thu, 1 Oct 2009 07:35:43 +0000 (00:35 -0700)]
More icons
Dmitri Plotnikov [Thu, 1 Oct 2009 06:48:12 +0000 (23:48 -0700)]
Refreshing view contact based on the result of editing
Specifically, when edit does joins, new contacts and deletes, the lookup key can change beyond recognition.
Change-Id: I6f8ec24ecaf3d1e80f765a5fa9e4fd3d371bf62c
Dmitri Plotnikov [Thu, 1 Oct 2009 05:32:13 +0000 (22:32 -0700)]
Moving join contact functionality to the Contact Edit screen.
Change-Id: I1630e909be3283d7274d093e8c86a8ee142d8afc
Evan Millar [Thu, 1 Oct 2009 06:32:27 +0000 (23:32 -0700)]
am
512f4c18: Merge change I511ba352 into eclair
Merge commit '
512f4c18a4c14f73faa2396455b94beead940d4f' into eclair-plus-aosp
* commit '
512f4c18a4c14f73faa2396455b94beead940d4f':
Remove tabs, join, and aggregate badge from ViewContactActivity
Android (Google) Code Review [Thu, 1 Oct 2009 06:25:28 +0000 (02:25 -0400)]
Merge change I511ba352 into eclair
* changes:
Remove tabs, join, and aggregate badge from ViewContactActivity
Mike Cleron [Thu, 1 Oct 2009 05:38:12 +0000 (22:38 -0700)]
am
ac77b4b2: Merge change Ie07ae802 into eclair
Merge commit '
ac77b4b25b2fc49afad2b43a48760db9ab32d4f5' into eclair-plus-aosp
* commit '
ac77b4b25b2fc49afad2b43a48760db9ab32d4f5':
New icon
Android (Google) Code Review [Thu, 1 Oct 2009 05:32:59 +0000 (01:32 -0400)]
Merge change Ie07ae802 into eclair
* changes:
New icon
Mike Cleron [Thu, 1 Oct 2009 05:30:28 +0000 (22:30 -0700)]
New icon
Evan Millar [Thu, 1 Oct 2009 04:58:36 +0000 (21:58 -0700)]
am
ad76e2f1: Merge change I8490c0ec into eclair
Merge commit '
ad76e2f140ff8c8e59d8837eb9a4ed3bdb481a9e' into eclair-plus-aosp
* commit '
ad76e2f140ff8c8e59d8837eb9a4ed3bdb481a9e':
com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT
Android (Google) Code Review [Thu, 1 Oct 2009 04:49:40 +0000 (00:49 -0400)]
Merge change I8490c0ec into eclair
* changes:
com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT
Evan Millar [Thu, 1 Oct 2009 04:45:08 +0000 (21:45 -0700)]
com.android.contacts.action.FAST_TRACK->com.android.contacts.action.QUICK_CONTACT
Change-Id: I8490c0ec674bd3dfc3944fcb54ae8f76e32fdb3c
Fred Quintana [Thu, 1 Oct 2009 04:38:11 +0000 (21:38 -0700)]
am
60d19a75: show events in the UI
Merge commit '
60d19a75d3cc28a0ff5ca2b875109b6236fe02a5' into eclair-plus-aosp
* commit '
60d19a75d3cc28a0ff5ca2b875109b6236fe02a5':
show events in the UI
Fred Quintana [Thu, 1 Oct 2009 00:22:21 +0000 (17:22 -0700)]
show events in the UI
Tadashi G. Takaoka [Thu, 1 Oct 2009 04:24:12 +0000 (21:24 -0700)]
am
8c732964: Merge change I2a7e4e10 into eclair
Merge commit '
8c732964e6cea4f2ef481b07b00e9ddd18abca2e' into eclair-plus-aosp
* commit '
8c732964e6cea4f2ef481b07b00e9ddd18abca2e':
Make secondary edit entries unvisible if no data kind for it.
Evan Millar [Thu, 1 Oct 2009 04:19:30 +0000 (21:19 -0700)]
am
0d0ab346: FastTrack->QuickContact
Merge commit '
0d0ab34639f8c509ff845a9ff0c85a1cdb9e4441' into eclair-plus-aosp
* commit '
0d0ab34639f8c509ff845a9ff0c85a1cdb9e4441':
FastTrack->QuickContact
Megha Joshi [Thu, 1 Oct 2009 04:18:35 +0000 (21:18 -0700)]
am
da13492d: Merge change I30d0cce2 into eclair
Merge commit '
da13492d62c87ca53f706bc476efd3caf47dd0af' into eclair-plus-aosp
* commit '
da13492d62c87ca53f706bc476efd3caf47dd0af':
Add ContactsContract.CALLER_IS_SYNCADAPTER query parameter to the
Megha Joshi [Thu, 1 Oct 2009 04:18:21 +0000 (21:18 -0700)]
am
d5afd8a1: Disable delete for read only contacts such as facebook contacts. Fixes bug
2121909.
Merge commit '
d5afd8a1103d5a8f7a18f52f521ad1dae6c3d592' into eclair-plus-aosp
* commit '
d5afd8a1103d5a8f7a18f52f521ad1dae6c3d592':
Disable delete for read only contacts such as facebook contacts.
Dmitri Plotnikov [Thu, 1 Oct 2009 04:17:49 +0000 (21:17 -0700)]
am
37beac4f: Merge change I1172406d into eclair
Merge commit '
37beac4f9288cb3bdef25d8e0632f6bd79b3a0e5' into eclair-plus-aosp
* commit '
37beac4f9288cb3bdef25d8e0632f6bd79b3a0e5':
Moving contact split functionality to contact Edit
Evan Millar [Thu, 1 Oct 2009 04:15:29 +0000 (21:15 -0700)]
Evan Millar [Wed, 30 Sep 2009 22:15:51 +0000 (15:15 -0700)]
Remove tabs, join, and aggregate badge from ViewContactActivity
Change-Id: I511ba352d6c9f155aa66c14123e1e90e9d530ec5
Android (Google) Code Review [Thu, 1 Oct 2009 04:10:33 +0000 (00:10 -0400)]
Merge change I2a7e4e10 into eclair
* changes:
Make secondary edit entries unvisible if no data kind for it.
Evan Millar [Thu, 1 Oct 2009 02:03:35 +0000 (19:03 -0700)]
FastTrack->QuickContact
Change-Id: I9376e6ffa2e804ba4a3b60465344b058064eb098