OSDN Git Service
Dmitri Plotnikov [Thu, 8 Oct 2009 01:21:42 +0000 (18:21 -0700)]
am
40332ac1: am
406ae422: [Issue
2174171] Fixing Join Contact UI title.
Merge commit '
40332ac121bf94d7384f705a862bdc44a529e424' into eclair-mr2-plus-aosp
* commit '
40332ac121bf94d7384f705a862bdc44a529e424':
[Issue
2174171] Fixing Join Contact UI title.
Dmitri Plotnikov [Thu, 8 Oct 2009 01:16:07 +0000 (18:16 -0700)]
am
406ae422: [Issue
2174171] Fixing Join Contact UI title.
Merge commit '
406ae42275eda1661aecc9afe088b654aac2193d' into eclair-mr2
* commit '
406ae42275eda1661aecc9afe088b654aac2193d':
[Issue
2174171] Fixing Join Contact UI title.
Dmitri Plotnikov [Thu, 8 Oct 2009 00:07:03 +0000 (17:07 -0700)]
[Issue
2174171] Fixing Join Contact UI title.
The title should read: "Select the contact you want to join with John Doe"
Change-Id: Iec1f41ce97e251635048f91020410cc1981cffbb
Neel Parekh [Thu, 8 Oct 2009 00:49:29 +0000 (17:49 -0700)]
am
9bef412e: am
0011e710: Fix clicking on the total contacts header item.
Merge commit '
9bef412eff75cb8f4d4e8b0b0d2861ce0a52cf80' into eclair-mr2-plus-aosp
* commit '
9bef412eff75cb8f4d4e8b0b0d2861ce0a52cf80':
Fix clicking on the total contacts header item.
Neel Parekh [Thu, 8 Oct 2009 00:45:05 +0000 (17:45 -0700)]
am
0011e710: Fix clicking on the total contacts header item.
Merge commit '
0011e710967a0545b1a5a519eb61f34dcb9db1cb' into eclair-mr2
* commit '
0011e710967a0545b1a5a519eb61f34dcb9db1cb':
Fix clicking on the total contacts header item.
Neel Parekh [Wed, 7 Oct 2009 20:52:38 +0000 (13:52 -0700)]
Fix clicking on the total contacts header item.
Bug:
2160378
Evan Millar [Thu, 8 Oct 2009 00:02:12 +0000 (17:02 -0700)]
am
d2e6989a: am
2a5a27a0: Fix bc_triaged b/issue?id=
2155790
Merge commit '
d2e6989a54d403930e5139026744c7e548bdf85b' into eclair-mr2-plus-aosp
* commit '
d2e6989a54d403930e5139026744c7e548bdf85b':
Fix bc_triaged http://b/issue?id=
2155790
Evan Millar [Thu, 8 Oct 2009 00:02:07 +0000 (17:02 -0700)]
am
92411eb0: am
a1ff78be: Merge change I89190b8b into eclair
Merge commit '
92411eb0ce6019e2f056ec1513202e1e993edbb5' into eclair-mr2-plus-aosp
* commit '
92411eb0ce6019e2f056ec1513202e1e993edbb5':
New photo frame in LARGE QuickCotnact window
Evan Millar [Wed, 7 Oct 2009 23:56:44 +0000 (16:56 -0700)]
am
2a5a27a0: Fix bc_triaged b/issue?id=
2155790
Merge commit '
2a5a27a05085c2e9d3884860970e2c56295de8c9' into eclair-mr2
* commit '
2a5a27a05085c2e9d3884860970e2c56295de8c9':
Fix bc_triaged http://b/issue?id=
2155790
Evan Millar [Wed, 7 Oct 2009 23:56:41 +0000 (16:56 -0700)]
am
a1ff78be: Merge change I89190b8b into eclair
Merge commit '
a1ff78bed118b545e24de6a8f5f2f01f9d0f3d9d' into eclair-mr2
* commit '
a1ff78bed118b545e24de6a8f5f2f01f9d0f3d9d':
New photo frame in LARGE QuickCotnact window
Evan Millar [Wed, 7 Oct 2009 22:15:05 +0000 (15:15 -0700)]
Fix bc_triaged http://b/issue?id=
2155790
Dr.No approval from Tim Sullivan
Change-Id: I893d40499303accbf675c7e7e2e5873b4800b052
Android (Google) Code Review [Wed, 7 Oct 2009 23:48:00 +0000 (19:48 -0400)]
Merge change I89190b8b into eclair
* changes:
New photo frame in LARGE QuickCotnact window
Tadashi G. Takaoka [Wed, 7 Oct 2009 23:35:52 +0000 (16:35 -0700)]
am
35fb5ef3: am
41449696: Merge change Ia961aa60 into eclair
Merge commit '
35fb5ef3f5b58e1e412754599dd321ca74784d9b' into eclair-mr2-plus-aosp
* commit '
35fb5ef3f5b58e1e412754599dd321ca74784d9b':
Contacts: fixed custom label handling in GenericEditorView.
Tadashi G. Takaoka [Wed, 7 Oct 2009 23:30:27 +0000 (16:30 -0700)]
am
41449696: Merge change Ia961aa60 into eclair
Merge commit '
4144969616439687e30d1beec041e6dee951bb37' into eclair-mr2
* commit '
4144969616439687e30d1beec041e6dee951bb37':
Contacts: fixed custom label handling in GenericEditorView.
Android (Google) Code Review [Wed, 7 Oct 2009 23:24:15 +0000 (19:24 -0400)]
Merge change Ia961aa60 into eclair
* changes:
Contacts: fixed custom label handling in GenericEditorView.
Evan Millar [Wed, 7 Oct 2009 22:36:36 +0000 (15:36 -0700)]
New photo frame in LARGE QuickCotnact window
bc_triaged bug: http://b/issue?id=
2170892
Dr.No: Tim Sullivan
Change-Id: I89190b8bf0ba019645c3beb2fe2b73decca0c948
Evan Millar [Wed, 7 Oct 2009 22:02:04 +0000 (15:02 -0700)]
am
f278917d: am
eb0d6997: Merge change I362ca992 into eclair
Merge commit '
f278917d95d8a72bcd6342dd2f591644f0c627a1' into eclair-mr2-plus-aosp
* commit '
f278917d95d8a72bcd6342dd2f591644f0c627a1':
Show message if contact has no data to show.
Evan Millar [Wed, 7 Oct 2009 21:57:16 +0000 (14:57 -0700)]
am
eb0d6997: Merge change I362ca992 into eclair
Merge commit '
eb0d69972dd7b77e3f43146ea5134c7953036ff4' into eclair-mr2
* commit '
eb0d69972dd7b77e3f43146ea5134c7953036ff4':
Show message if contact has no data to show.
Android (Google) Code Review [Wed, 7 Oct 2009 21:46:42 +0000 (17:46 -0400)]
Merge change I362ca992 into eclair
* changes:
Show message if contact has no data to show.
Tadashi G. Takaoka [Wed, 7 Oct 2009 21:28:44 +0000 (14:28 -0700)]
Contacts: fixed custom label handling in GenericEditorView.
Internal Bug: http://b/
2173080
Jeff Hamilton [Wed, 7 Oct 2009 20:49:05 +0000 (13:49 -0700)]
am
3abac16d: am
1fb6275a: Updates to the edit contact UI.
Merge commit '
3abac16daad864a65cc33414af407c4e8a46e0d2' into eclair-mr2-plus-aosp
* commit '
3abac16daad864a65cc33414af407c4e8a46e0d2':
Updates to the edit contact UI.
Jeff Hamilton [Wed, 7 Oct 2009 20:44:01 +0000 (13:44 -0700)]
am
1fb6275a: Updates to the edit contact UI.
Merge commit '
1fb6275a57318261cb6dba511954cb754cd17fa2' into eclair-mr2
* commit '
1fb6275a57318261cb6dba511954cb754cd17fa2':
Updates to the edit contact UI.
Jeff Hamilton [Wed, 7 Oct 2009 09:40:27 +0000 (04:40 -0500)]
Updates to the edit contact UI.
- Updated account colors and color layout
- Updated display in read-only mode
- Clearer strings to identify accounts
- Sort the contacts to edit so read-only ones
always are at the bottom.
Fixes
2163539 and a good portion of
2163519.
Change-Id: Ib2afc992a8623f2a253d2a52a0b5c50ee866e5d8
Eric Fischer [Wed, 7 Oct 2009 18:51:59 +0000 (11:51 -0700)]
am
305e2d71: am
0d37e1bb: (-s ours) Merge change Ice23b740 into eclair
Merge commit '
305e2d7192a65e1adfbeb9605529b16c635cd4d7' into eclair-mr2-plus-aosp
* commit '
305e2d7192a65e1adfbeb9605529b16c635cd4d7':
Import revised translations. DO NOT MERGE
Evan Millar [Wed, 7 Oct 2009 18:47:35 +0000 (11:47 -0700)]
Show message if contact has no data to show.
Fixes bc_triaged bug http://b/issue?id=
2170901
Dr.NO approval from Tim Sullivan
Change-Id: I362ca992c3a97792fbc2d76fc3bcf4178bfefcd5
Eric Fischer [Wed, 7 Oct 2009 18:46:28 +0000 (11:46 -0700)]
am
0d37e1bb: (-s ours) Merge change Ice23b740 into eclair
Merge commit '
0d37e1bb98d4fc3a156708225d42f23f6bb27f3d' into eclair-mr2
* commit '
0d37e1bb98d4fc3a156708225d42f23f6bb27f3d':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 7 Oct 2009 18:36:48 +0000 (14:36 -0400)]
Merge change Ice23b740 into eclair
* changes:
Import revised translations. DO NOT MERGE
Jeff Hamilton [Wed, 7 Oct 2009 03:47:57 +0000 (20:47 -0700)]
am
131deab4: am
d5a4567a: One more last minute string.
Merge commit '
131deab4c76bb4a993e3434c37ebc248b6ee222e' into eclair-mr2-plus-aosp
* commit '
131deab4c76bb4a993e3434c37ebc248b6ee222e':
One more last minute string.
Jeff Hamilton [Wed, 7 Oct 2009 03:42:46 +0000 (20:42 -0700)]
am
d5a4567a: One more last minute string.
Merge commit '
d5a4567ac32a4162e0cd35aa732e2aeb80280cdb' into eclair-mr2
* commit '
d5a4567ac32a4162e0cd35aa732e2aeb80280cdb':
One more last minute string.
Jeff Hamilton [Wed, 7 Oct 2009 03:13:26 +0000 (20:13 -0700)]
am
c366efc4: am
01c68659: Checkpoint new strings for translation.
Merge commit '
c366efc49f8686ccfcdd7b37a612fa10f8687e11' into eclair-mr2-plus-aosp
* commit '
c366efc49f8686ccfcdd7b37a612fa10f8687e11':
Checkpoint new strings for translation.
Costin Manolache [Wed, 7 Oct 2009 03:13:22 +0000 (20:13 -0700)]
am
96435b22: am
76c9ec4b: Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Merge commit '
96435b228fb4746a75c65c88e041f71412a7b8e0' into eclair-mr2-plus-aosp
* commit '
96435b228fb4746a75c65c88e041f71412a7b8e0':
Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Dmitri Plotnikov [Wed, 7 Oct 2009 03:13:18 +0000 (20:13 -0700)]
am
cdf93193: am
8debb14b: [Issue
2166752] Properly displaying phone numbers containing letters
Merge commit '
cdf931931403b5f8569676f1416b463a9bb0ff17' into eclair-mr2-plus-aosp
* commit '
cdf931931403b5f8569676f1416b463a9bb0ff17':
[Issue
2166752] Properly displaying phone numbers containing letters
Jeff Hamilton [Wed, 7 Oct 2009 03:12:02 +0000 (22:12 -0500)]
One more last minute string.
Change-Id: Ifc0220ae3af63b0d97b2ae5ab6963108119ded67
Jeff Hamilton [Wed, 7 Oct 2009 03:08:19 +0000 (20:08 -0700)]
am
01c68659: Checkpoint new strings for translation.
Merge commit '
01c68659a500523c32188ef0a3f5eccc7af57652' into eclair-mr2
* commit '
01c68659a500523c32188ef0a3f5eccc7af57652':
Checkpoint new strings for translation.
Costin Manolache [Wed, 7 Oct 2009 03:08:15 +0000 (20:08 -0700)]
am
76c9ec4b: Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Merge commit '
76c9ec4bab499989f6e8f7448d228687b235d58c' into eclair-mr2
* commit '
76c9ec4bab499989f6e8f7448d228687b235d58c':
Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Dmitri Plotnikov [Wed, 7 Oct 2009 03:08:12 +0000 (20:08 -0700)]
am
8debb14b: [Issue
2166752] Properly displaying phone numbers containing letters
Merge commit '
8debb14bd3593bcc505bb0da29bc8239dadc6553' into eclair-mr2
* commit '
8debb14bd3593bcc505bb0da29bc8239dadc6553':
[Issue
2166752] Properly displaying phone numbers containing letters
Jeff Hamilton [Tue, 6 Oct 2009 03:39:45 +0000 (22:39 -0500)]
Checkpoint new strings for translation.
Change-Id: Iba348222094cc40bd9657fea35396e26b3b7c779
Costin Manolache [Wed, 7 Oct 2009 00:28:39 +0000 (17:28 -0700)]
Part of Bug
2163087 fix - NPE if the main thread is removing the reference.
Dmitri Plotnikov [Wed, 7 Oct 2009 00:30:58 +0000 (17:30 -0700)]
[Issue
2166752] Properly displaying phone numbers containing letters
Change-Id: Ia2d815925d672d46f0269e926438c3dc8739006b
Eric Fischer [Tue, 6 Oct 2009 23:52:42 +0000 (16:52 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Jeff Sharkey [Tue, 6 Oct 2009 23:51:34 +0000 (16:51 -0700)]
am
36ef0608: am
d1037fdb: Merge change I9a8a3d9d into eclair
Merge commit '
36ef0608702cfdc4f331646611c5e8616db19666' into eclair-mr2-plus-aosp
* commit '
36ef0608702cfdc4f331646611c5e8616db19666':
Fix FastTrack recycling consistency issues, shadows.
Jeff Sharkey [Tue, 6 Oct 2009 23:44:55 +0000 (16:44 -0700)]
am
d1037fdb: Merge change I9a8a3d9d into eclair
Merge commit '
d1037fdbfd72209d179214dd6151e6425d4a267f' into eclair-mr2
* commit '
d1037fdbfd72209d179214dd6151e6425d4a267f':
Fix FastTrack recycling consistency issues, shadows.
Android (Google) Code Review [Tue, 6 Oct 2009 23:37:33 +0000 (19:37 -0400)]
Merge change I9a8a3d9d into eclair
* changes:
Fix FastTrack recycling consistency issues, shadows.
Evan Millar [Tue, 6 Oct 2009 23:10:08 +0000 (16:10 -0700)]
am
a03fb550: am
3075f6a4: Display empty text when there are no contacts visible.
Merge commit '
a03fb550fb660600956f4bc18b1d0991885dee55' into eclair-mr2-plus-aosp
* commit '
a03fb550fb660600956f4bc18b1d0991885dee55':
Display empty text when there are no contacts visible.
Evan Millar [Tue, 6 Oct 2009 23:03:42 +0000 (16:03 -0700)]
am
3075f6a4: Display empty text when there are no contacts visible.
Merge commit '
3075f6a408768cac749edb786feac71afa7d7b64' into eclair-mr2
* commit '
3075f6a408768cac749edb786feac71afa7d7b64':
Display empty text when there are no contacts visible.
Evan Millar [Tue, 6 Oct 2009 20:34:15 +0000 (13:34 -0700)]
Display empty text when there are no contacts visible.
-bc triaged bug: http://b/issue?id=
2162934
Change-Id: I331918d70282bb2e123da22bc940168c41406326
Jeff Sharkey [Mon, 5 Oct 2009 18:15:57 +0000 (11:15 -0700)]
Fix FastTrack recycling consistency issues, shadows.
When FastTrack is displayed and a configuration change
occurs, we tear down and recreate the host Activity, but in
the process moveTaskToBack(), which means the next trigger
will show a stale track and rectangle.
This change dismisses the track in onPause() to reduce risk
of bringing back a stale track. It also introduces a new
mDismissed flag to catch any race conditions where the track
is dismissed before showInternal() is called.
When requested a show() and already visible, instead of
ignoring, I'm calling dismissInternal() to replace the track
with the updated request. I'm also using query tokens to
ignore query results from stale show() requests.
This change also fixes padding in the large FT format when
no photo is available. It also fixes shadow behind track
to remove sharp vertical edges visible during animations.
Also clears "make default" checkbox between recycles and
fixes an issue where icons for preferred apps remained after
the user selects "always use" from intent disambig list.
Fixes http://b/
2163611 and http://b/
2164119
Jeff Sharkey [Tue, 6 Oct 2009 22:18:19 +0000 (15:18 -0700)]
am
3d9a3209: am
685fdd50: Merge change I23d84a63 into eclair
Merge commit '
3d9a3209a940c18efc7b69bbbeaff09745b9adcc' into eclair-mr2-plus-aosp
* commit '
3d9a3209a940c18efc7b69bbbeaff09745b9adcc':
Include Google Talk presence, even when missing Im rows.
Costin Manolache [Tue, 6 Oct 2009 22:18:08 +0000 (15:18 -0700)]
am
4bd352d5: am
c759ffbc: Merge change I740cfdad into eclair
Merge commit '
4bd352d5103d74cfdc269fe2faa846a9f8901993' into eclair-mr2-plus-aosp
* commit '
4bd352d5103d74cfdc269fe2faa846a9f8901993':
Use a thread pool to fetch images. Bug
2163087.
Megha Joshi [Tue, 6 Oct 2009 22:18:05 +0000 (15:18 -0700)]
am
0b9d552c: am
d40d7f06: Merge change I6238c621 into eclair
Merge commit '
0b9d552c49816637b7dc82404b26db6c096c3770' into eclair-mr2-plus-aosp
* commit '
0b9d552c49816637b7dc82404b26db6c096c3770':
Prevents empty focus contacts without photo from being created.
Megha Joshi [Mon, 5 Oct 2009 21:13:58 +0000 (14:13 -0700)]
Prevents empty focus contacts without photo from being created.
Bug:
2133257
Dr No: TS
Jeff Sharkey [Tue, 6 Oct 2009 21:26:18 +0000 (14:26 -0700)]
am
685fdd50: Merge change I23d84a63 into eclair
Merge commit '
685fdd508523225bcb52a862c530b3cd6dd30cb0' into eclair-mr2
* commit '
685fdd508523225bcb52a862c530b3cd6dd30cb0':
Include Google Talk presence, even when missing Im rows.
Android (Google) Code Review [Tue, 6 Oct 2009 21:21:22 +0000 (17:21 -0400)]
Merge change I23d84a63 into eclair
* changes:
Include Google Talk presence, even when missing Im rows.
Costin Manolache [Tue, 6 Oct 2009 20:58:39 +0000 (13:58 -0700)]
am
c759ffbc: Merge change I740cfdad into eclair
Merge commit '
c759ffbcc1564b81b9715835bd6b63c293dd6b8f' into eclair-mr2
* commit '
c759ffbcc1564b81b9715835bd6b63c293dd6b8f':
Use a thread pool to fetch images. Bug
2163087.
Android (Google) Code Review [Tue, 6 Oct 2009 20:49:13 +0000 (16:49 -0400)]
Merge change I740cfdad into eclair
* changes:
Use a thread pool to fetch images. Bug
2163087.
Jeff Sharkey [Fri, 2 Oct 2009 04:32:19 +0000 (21:32 -0700)]
Include Google Talk presence, even when missing Im rows.
When inserting Google Talk presence updates, we match on
both Im and Email rows. This change adds presence "dots"
to individual Im rows, and creates in-memory Im rows when
Email entries have presence.
This loads status details through a second query and holds
back building UI until both queries finish. This change
also generalizes logic for building Im intents borrowed
from FastTrack code.
This change also fixes a regression that was dropping third-
party data rows. The second-query approach above allows us
to remove a large chunk of code that was using old API.
Fixes http://b/
2161796
Costin Manolache [Tue, 6 Oct 2009 19:22:09 +0000 (12:22 -0700)]
Use a thread pool to fetch images. Bug
2163087.
Megha Joshi [Tue, 6 Oct 2009 18:29:20 +0000 (11:29 -0700)]
am
d40d7f06: Merge change I6238c621 into eclair
Merge commit '
d40d7f06ba0d87d2c1e78f382ce78c3c8a25fbfc' into eclair-mr2
* commit '
d40d7f06ba0d87d2c1e78f382ce78c3c8a25fbfc':
Prevents empty focus contacts without photo from being created.
Android (Google) Code Review [Tue, 6 Oct 2009 18:23:53 +0000 (14:23 -0400)]
Merge change I6238c621 into eclair
* changes:
Prevents empty focus contacts without photo from being created.
Megha Joshi [Mon, 5 Oct 2009 21:13:58 +0000 (14:13 -0700)]
Prevents empty focus contacts without photo from being created.
Bug:
2133257
Dr No: TS
Evan Millar [Tue, 6 Oct 2009 17:25:49 +0000 (10:25 -0700)]
am
1c917836: am
585e10f7: Merge change Ifb476198 into eclair
Merge commit '
1c9178364506b46100f6047f76d8eb7f3438a60c' into eclair-mr2-plus-aosp
* commit '
1c9178364506b46100f6047f76d8eb7f3438a60c':
Use framework assets for section headers, and adjust layout to pixel perfect.
Evan Millar [Tue, 6 Oct 2009 17:19:58 +0000 (10:19 -0700)]
am
585e10f7: Merge change Ifb476198 into eclair
Merge commit '
585e10f7a3992682f10b9e3f24bf7bd7f5170cb6' into eclair-mr2
* commit '
585e10f7a3992682f10b9e3f24bf7bd7f5170cb6':
Use framework assets for section headers, and adjust layout to pixel perfect.
Android (Google) Code Review [Tue, 6 Oct 2009 17:14:57 +0000 (13:14 -0400)]
Merge change Ifb476198 into eclair
* changes:
Use framework assets for section headers, and adjust layout to pixel perfect.
Daniel Sandler [Tue, 6 Oct 2009 17:03:01 +0000 (10:03 -0700)]
am
f7171589: am
75d2fdcb: Updated icons for Contacts.
Merge commit '
f7171589759408f037a1153253bbe6747701495d' into eclair-mr2-plus-aosp
* commit '
f7171589759408f037a1153253bbe6747701495d':
Updated icons for Contacts.
Daniel Sandler [Tue, 6 Oct 2009 16:56:06 +0000 (09:56 -0700)]
am
75d2fdcb: Updated icons for Contacts.
Merge commit '
75d2fdcb29853e5a468f7c68e25a272b3b6e2f52' into eclair-mr2
* commit '
75d2fdcb29853e5a468f7c68e25a272b3b6e2f52':
Updated icons for Contacts.
Evan Millar [Mon, 5 Oct 2009 23:06:29 +0000 (16:06 -0700)]
Use framework assets for section headers, and adjust layout to pixel perfect.
-triaged bug http://b/issue?id=
2153296
-Tim Sullivan gave Dr. No approval.
Change-Id: Ifb4761986cf3c991d9af5deacb15ac256a603e4a
Daniel Sandler [Tue, 6 Oct 2009 15:34:40 +0000 (11:34 -0400)]
Updated icons for Contacts.
DrNo: mcleron
Change-Id: I4392f12a57e611f744a61a9bd1c0ccf3bba437a4
Dmitri Plotnikov [Tue, 6 Oct 2009 02:54:30 +0000 (19:54 -0700)]
am
55aac855: am
8577fee2: Merge change I517b266a into eclair
Merge commit '
55aac8551f6d9c5085f373210e0a6bd9f159e56b' into eclair-mr2-plus-aosp
* commit '
55aac8551f6d9c5085f373210e0a6bd9f159e56b':
[Issue
2165144] Fixing managed delete dialogs in ContactListActivity
Dmitri Plotnikov [Tue, 6 Oct 2009 02:49:11 +0000 (19:49 -0700)]
am
8577fee2: Merge change I517b266a into eclair
Merge commit '
8577fee2a6ba9ba6d4aac635c85ff6034dfcca45' into eclair-mr2
* commit '
8577fee2a6ba9ba6d4aac635c85ff6034dfcca45':
[Issue
2165144] Fixing managed delete dialogs in ContactListActivity
Android (Google) Code Review [Tue, 6 Oct 2009 02:40:28 +0000 (22:40 -0400)]
Merge change I517b266a into eclair
* changes:
[Issue
2165144] Fixing managed delete dialogs in ContactListActivity
Jeff Sharkey [Tue, 6 Oct 2009 00:11:38 +0000 (17:11 -0700)]
am
3abc38af: am
5cbf6f43: Exclude FastTrack window from recent apps.
Merge commit '
3abc38af577f5ee3c75c51ec759276751ac90c14' into eclair-mr2-plus-aosp
* commit '
3abc38af577f5ee3c75c51ec759276751ac90c14':
Exclude FastTrack window from recent apps.
Dmitri Plotnikov [Tue, 6 Oct 2009 00:05:37 +0000 (17:05 -0700)]
[Issue
2165144] Fixing managed delete dialogs in ContactListActivity
Since these dialogs are managed, they are not actually destroyed after the first
use, but reused. These dialogs were initialized with the URI of the first
contact we were deleting. On subsequent calls, they were reused and tried to
delete the same contact.
Change-Id: I517b266a96fe72268c8dfbc7fe3f84fa366d7a23
Jeff Sharkey [Tue, 6 Oct 2009 00:05:29 +0000 (17:05 -0700)]
am
5cbf6f43: Exclude FastTrack window from recent apps.
Merge commit '
5cbf6f43dadda66630a2bdb7a744b62f1cef507d' into eclair-mr2
* commit '
5cbf6f43dadda66630a2bdb7a744b62f1cef507d':
Exclude FastTrack window from recent apps.
Jeff Sharkey [Fri, 2 Oct 2009 21:22:51 +0000 (14:22 -0700)]
Exclude FastTrack window from recent apps.
Fixes http://b/
2163542
Neel Parekh [Mon, 5 Oct 2009 23:32:14 +0000 (16:32 -0700)]
am
59afce1d: am
cf1af9a1: Merge change I14fec660 into eclair
Merge commit '
59afce1d545349adffc30978b73ad34096608998' into eclair-mr2-plus-aosp
* commit '
59afce1d545349adffc30978b73ad34096608998':
Fix NPE being thrown when starting the AttachImage activity.
Neel Parekh [Mon, 5 Oct 2009 23:26:32 +0000 (16:26 -0700)]
am
cf1af9a1: Merge change I14fec660 into eclair
Merge commit '
cf1af9a1c72ac1c47c4cc76120352b75731dfa2d' into eclair-mr2
* commit '
cf1af9a1c72ac1c47c4cc76120352b75731dfa2d':
Fix NPE being thrown when starting the AttachImage activity.
Android (Google) Code Review [Mon, 5 Oct 2009 23:18:40 +0000 (19:18 -0400)]
Merge change I14fec660 into eclair
* changes:
Fix NPE being thrown when starting the AttachImage activity.
Neel Parekh [Mon, 5 Oct 2009 21:56:48 +0000 (14:56 -0700)]
Fix NPE being thrown when starting the AttachImage activity.
Bug:
2164613
Daisuke Miyakawa [Mon, 5 Oct 2009 21:02:51 +0000 (14:02 -0700)]
am
f62d58fc: Merge change I806ebb68 into eclair-mr2
Merge commit '
f62d58fc3d3a45d206186c7e3090d354b2a7e6e5' into eclair-mr2-plus-aosp
* commit '
f62d58fc3d3a45d206186c7e3090d354b2a7e6e5':
Use VCardDataBuilder#cancel().
Android (Google) Code Review [Mon, 5 Oct 2009 20:56:46 +0000 (16:56 -0400)]
Merge change I806ebb68 into eclair-mr2
* changes:
Use VCardDataBuilder#cancel().
Daisuke Miyakawa [Mon, 5 Oct 2009 20:54:41 +0000 (13:54 -0700)]
Use VCardDataBuilder#cancel().
Internal Issue number:
2158261
Fred Quintana [Mon, 5 Oct 2009 18:40:45 +0000 (11:40 -0700)]
am
5fbf1d61: am
8e55e0da: account manager api review changes
Merge commit '
5fbf1d613c135e0949710f864fa07049b0c74219' into eclair-mr2-plus-aosp
* commit '
5fbf1d613c135e0949710f864fa07049b0c74219':
account manager api review changes
Bjorn Bringert [Mon, 5 Oct 2009 18:40:45 +0000 (11:40 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Contacts into eclair-mr2-plus-aosp
Fred Quintana [Mon, 5 Oct 2009 18:34:27 +0000 (11:34 -0700)]
am
8e55e0da: account manager api review changes
Merge commit '
8e55e0daa3967dbfdada4a42bec51a0435bc3384' into eclair-mr2
* commit '
8e55e0daa3967dbfdada4a42bec51a0435bc3384':
account manager api review changes
Fred Quintana [Sat, 3 Oct 2009 00:19:11 +0000 (17:19 -0700)]
account manager api review changes
Nicolas Catania [Sun, 4 Oct 2009 22:21:45 +0000 (15:21 -0700)]
am
d7a3cd59: Merge change I3040fa30 into eclair
Merge commit '
d7a3cd594c29d2cce161dce76bf22970a2184a96' into eclair-mr2
* commit '
d7a3cd594c29d2cce161dce76bf22970a2184a96':
Taping the dialed number allows editing.
Megha Joshi [Sun, 4 Oct 2009 22:21:41 +0000 (15:21 -0700)]
am
c508bd8c: Fixes bug where delete option from Menu list is disabled in Contact view mode. Bug was caused by the count increment logic being removed in the next submitted change https://android-git.corp.google.com/w/?p=platform/packages/apps/Contacts.git;a=commit;h=d
Merge commit '
c508bd8c0d697bd7e8cf62e025ef32f3f2169d9a' into eclair-mr2
* commit '
c508bd8c0d697bd7e8cf62e025ef32f3f2169d9a':
Fixes bug where delete option from Menu list is disabled in Contact view mode.
Dmitri Plotnikov [Sun, 4 Oct 2009 22:20:49 +0000 (15:20 -0700)]
am
f042df95: [Issue
2157935] Adding a confirmation dialog for contact split.
Merge commit '
f042df95fa3d3e0560ceec93c4c66e2d3f6f3224' into eclair-mr2
* commit '
f042df95fa3d3e0560ceec93c4c66e2d3f6f3224':
[Issue
2157935] Adding a confirmation dialog for contact split.
Dmitri Plotnikov [Sun, 4 Oct 2009 22:20:12 +0000 (15:20 -0700)]
am
b8594f27: [Issue
2161366] Changing strings for total number of contacts displayed
Merge commit '
b8594f275a415a92255172251cadd78f16bdf01a' into eclair-mr2
* commit '
b8594f275a415a92255172251cadd78f16bdf01a':
[Issue
2161366] Changing strings for total number of contacts displayed
Jeff Sharkey [Sun, 4 Oct 2009 22:19:16 +0000 (15:19 -0700)]
am
e1032fa1: Dismiss FastTrack only after calling startActivity().
Merge commit '
e1032fa194fbb9117b511e17f9cac60d61fd11f1' into eclair-mr2
* commit '
e1032fa194fbb9117b511e17f9cac60d61fd11f1':
Dismiss FastTrack only after calling startActivity().
Neel Parekh [Sun, 4 Oct 2009 22:18:30 +0000 (15:18 -0700)]
am
6c0f8cf8: Fix attaching image on "new contact" screen.
Merge commit '
6c0f8cf83c2959332e2d883c211144a4b87444a0' into eclair-mr2
* commit '
6c0f8cf83c2959332e2d883c211144a4b87444a0':
Fix attaching image on "new contact" screen.
Mike Cleron [Sun, 4 Oct 2009 22:17:38 +0000 (15:17 -0700)]
am
f1b30aae: Merge change Ifaf19b53 into eclair
Merge commit '
f1b30aae6adcdd3b32536f66b03ff27901a776f2' into eclair-mr2
* commit '
f1b30aae6adcdd3b32536f66b03ff27901a776f2':
More icons
Eric Fischer [Sun, 4 Oct 2009 22:15:44 +0000 (15:15 -0700)]
am
eb3c86d7: (-s ours) Merge change I08582aef into eclair
Merge commit '
eb3c86d7f7a3faa828f071206aa9fb4038114a11' into eclair-mr2
* commit '
eb3c86d7f7a3faa828f071206aa9fb4038114a11':
Import revised translations. DO NOT MERGE
Dmitri Plotnikov [Sun, 4 Oct 2009 22:14:36 +0000 (15:14 -0700)]
am
f3bd80a2: [Issue
2153296] Updating contact list section headers
Merge commit '
f3bd80a2fcf72871eec957cc59cdae5a54fb0285' into eclair-mr2
* commit '
f3bd80a2fcf72871eec957cc59cdae5a54fb0285':
[Issue
2153296] Updating contact list section headers
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.
Android (Google) Code Review [Sat, 3 Oct 2009 15:16:11 +0000 (11:16 -0400)]
Merge change I3040fa30 into eclair
* changes:
Taping the dialed number allows editing.
Megha Joshi [Fri, 2 Oct 2009 00:31:49 +0000 (17:31 -0700)]
Fixes bug where delete option from Menu list is disabled in Contact view mode.
Bug was caused by the count increment logic being removed in the next submitted change
https://android-git.corp.google.com/w/?p=platform/packages/apps/Contacts.git;a=commit;h=
df18120ed2c37a45eb47e39c4da0c8e3b6eb335c
Disabled menu was removed in some other subsequent change, so adding dialog for the case when writable contacts = 0.
Changes delete contact bebavior in EditContactActivity to be same
ViewContactActivity.
Updates dialog message for readonly contact deletion.
bug
2161222
Dr No : TS
Reviewed By: dplotnikov, timsullivan
Dmitri Plotnikov [Sat, 3 Oct 2009 00:34:27 +0000 (17:34 -0700)]
[Issue
2157935] Adding a confirmation dialog for contact split.
Also renaming the menu button to "Separate"
Also making the menu button only visible for aggregate contacts
Bug discussed with and approved by Tim.
Change-Id: Ie6950b2779c37a1694e01e5ca5ef819ae3d850b5
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
Dmitri Plotnikov [Fri, 2 Oct 2009 23:00:18 +0000 (16:00 -0700)]
[Issue
2161366] Changing strings for total number of contacts displayed
Approved by Tim.
Change-Id: I43bf6d71193f0d6315b3c06a2da8824f01f102d7