OSDN Git Service
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
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
Jeff Sharkey [Fri, 2 Oct 2009 02:51:14 +0000 (19:51 -0700)]
Dismiss FastTrack only after calling startActivity().
When launching towards an existing task where the target
activity is already at the top of that task, we triggered
a check in ActivityManager that requires the caller to be
in the foreground. Before this change, we dismissed the
dialog before calling startActivity(), meaning that in
this case the user action would result in a no-op.
Fixes http://b/
2162031
Neel Parekh [Fri, 2 Oct 2009 17:49:22 +0000 (10:49 -0700)]
Fix attaching image on "new contact" screen.
Bug:
2161910
Dr. NO: TS
Nicolas Catania [Thu, 1 Oct 2009 20:00:53 +0000 (13:00 -0700)]
Taping the dialed number allows editing.
Previously, taping the dialed number used to dial the number.
Now if non-empty, a cursor shows up at the tap location.
The user can then use the dialpad to delete/insert new numbers.
The previous version of the selectors that drive the number background
has been moved to the non finger drawable because they show the right
background when focused.
In touch mode, the background does not change when focused.
Bug:
2160189
Android (Google) Code Review [Fri, 2 Oct 2009 07:58:33 +0000 (03:58 -0400)]
Merge change Ifaf19b53 into eclair
* changes:
More icons
Mike Cleron [Fri, 2 Oct 2009 07:35:09 +0000 (00:35 -0700)]
More icons
Android (Google) Code Review [Fri, 2 Oct 2009 04:48:16 +0000 (00:48 -0400)]
Merge change I08582aef into eclair
* changes:
Import revised translations. DO NOT MERGE
Dmitri Plotnikov [Thu, 1 Oct 2009 23:48:00 +0000 (16:48 -0700)]
[Issue
2153296] Updating contact list section headers
Also fixing the menu icon for split
Change-Id: Ic6cffb2760273c89dfa0d60d1ba5307316390b68
Eric Fischer [Thu, 1 Oct 2009 23:58:14 +0000 (16:58 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Evan Millar [Thu, 1 Oct 2009 20:00:53 +0000 (13:00 -0700)]
Fix bug http://b/issue?id=
2160189
Change-Id: I99f3aa5c159e999a2d2bd4526a4540e68af90d1d
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
Android (Google) Code Review [Thu, 1 Oct 2009 03:38:06 +0000 (23:38 -0400)]
Merge change I30d0cce2 into eclair
* changes:
Add ContactsContract.CALLER_IS_SYNCADAPTER query parameter to the ContentProviderOperation which updates group display/should_sync values.
Megha Joshi [Tue, 22 Sep 2009 16:38:41 +0000 (09:38 -0700)]
Disable delete for read only contacts such as facebook contacts.
Fixes bug
2121909.
Android (Google) Code Review [Thu, 1 Oct 2009 03:14:43 +0000 (23:14 -0400)]
Merge change I1172406d into eclair
* changes:
Moving contact split functionality to contact Edit
Dmitri Plotnikov [Thu, 1 Oct 2009 03:06:03 +0000 (20:06 -0700)]
Moving contact split functionality to contact Edit
Change-Id: I1172406d9eaed9b996d0376ff23413c8d7848d06
Evan Millar [Thu, 1 Oct 2009 01:33:17 +0000 (18:33 -0700)]
Fix http://b/issue?id=
2158641
Change-Id: I91f020b4d762fcaf0072d641a8a926897b7b3cd5
Tadashi G. Takaoka [Wed, 30 Sep 2009 17:05:21 +0000 (10:05 -0700)]
Make secondary edit entries unvisible if no data kind for it.
Internal Bug:
2151377
Megha Joshi [Thu, 1 Oct 2009 00:17:12 +0000 (17:17 -0700)]
Add ContactsContract.CALLER_IS_SYNCADAPTER query parameter to the
ContentProviderOperation which updates group display/should_sync values.
Partly fixes
2093578
Evan Millar [Wed, 30 Sep 2009 23:23:34 +0000 (16:23 -0700)]
am
7316bfd2: Merge change I5ba08ed2 into eclair
Merge commit '
7316bfd2847758ee01f0f6068d5d488aa7da9a02' into eclair-plus-aosp
* commit '
7316bfd2847758ee01f0f6068d5d488aa7da9a02':
Final drop of hdpi assets for contacts.
Android (Google) Code Review [Wed, 30 Sep 2009 22:52:35 +0000 (18:52 -0400)]
Merge change I5ba08ed2 into eclair
* changes:
Final drop of hdpi assets for contacts.
Evan Millar [Wed, 30 Sep 2009 19:12:44 +0000 (12:12 -0700)]
Final drop of hdpi assets for contacts.
Change-Id: I5ba08ed2d113779cb0994e049d9a176a85e052f9
Jeff Hamilton [Wed, 30 Sep 2009 21:57:21 +0000 (14:57 -0700)]
am
04500c64: String change from Roy.
Merge commit '
04500c6486273d7984df08eb5e2fb8d97da71c92' into eclair-plus-aosp
* commit '
04500c6486273d7984df08eb5e2fb8d97da71c92':
String change from Roy.
Jeff Hamilton [Wed, 30 Sep 2009 21:50:11 +0000 (14:50 -0700)]
String change from Roy.
Change-Id: I2bffa4fb041038e2ca315cf7dc82f9d2ec73eb53
Neel Parekh [Wed, 30 Sep 2009 21:20:35 +0000 (14:20 -0700)]
am
bdd3e583: Merge change I6f9a7185 into eclair
Merge commit '
bdd3e5839d516aac510fc923d047de69ba0a5976' into eclair-plus-aosp
* commit '
bdd3e5839d516aac510fc923d047de69ba0a5976':
Fix the number off by one when typing in the contact list.
Megha Joshi [Wed, 30 Sep 2009 21:20:31 +0000 (14:20 -0700)]
am
8ad339b4: Merge change I041d3933 into eclair
Merge commit '
8ad339b463dc51ad7e919b6c2a3b301381fd17ec' into eclair-plus-aosp
* commit '
8ad339b463dc51ad7e919b6c2a3b301381fd17ec':
Add import export menu drawables.
Megha Joshi [Wed, 30 Sep 2009 21:20:17 +0000 (14:20 -0700)]
am
3c91b8ae: Merge change I6d074325 into eclair
Merge commit '
3c91b8ae8730e73cb8a4b99c2b1de59011dad00b' into eclair-plus-aosp
* commit '
3c91b8ae8730e73cb8a4b99c2b1de59011dad00b':
Add FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET Intent flag to each of
Android (Google) Code Review [Wed, 30 Sep 2009 21:16:23 +0000 (17:16 -0400)]
Merge change I6f9a7185 into eclair
* changes:
Fix the number off by one when typing in the contact list.
Neel Parekh [Wed, 30 Sep 2009 20:59:44 +0000 (13:59 -0700)]
Fix the number off by one when typing in the contact list.
Bug:
2157000
Android (Google) Code Review [Wed, 30 Sep 2009 21:15:35 +0000 (17:15 -0400)]
Merge change I041d3933 into eclair
* changes:
Add import export menu drawables.
Android (Google) Code Review [Wed, 30 Sep 2009 21:15:16 +0000 (17:15 -0400)]
Merge change I6d074325 into eclair
* changes:
Add FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET Intent flag to each of the intents launched from fasttrack window.
Megha Joshi [Wed, 30 Sep 2009 20:58:48 +0000 (13:58 -0700)]
Add import export menu drawables.
fixes
2096050
Megha Joshi [Wed, 30 Sep 2009 04:49:35 +0000 (21:49 -0700)]
Add FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET Intent flag to each of
the intents launched from fasttrack window.
Fixes bug
2137624
Evan Millar [Wed, 30 Sep 2009 20:04:35 +0000 (13:04 -0700)]
am
c30e11cc: Merge change I1ad6f4ae into eclair
Merge commit '
c30e11cc31b419d67999db2e3ccbc7ef351d7140' into eclair-plus-aosp
* commit '
c30e11cc31b419d67999db2e3ccbc7ef351d7140':
Use soft uris in ViewContactActivity and ContactOptionsActivity.
Android (Google) Code Review [Wed, 30 Sep 2009 19:56:15 +0000 (15:56 -0400)]
Merge change I1ad6f4ae into eclair
* changes:
Use soft uris in ViewContactActivity and ContactOptionsActivity.
Evan Millar [Tue, 29 Sep 2009 21:00:43 +0000 (14:00 -0700)]
Use soft uris in ViewContactActivity and ContactOptionsActivity.
Change-Id: I1ad6f4aef27dec2007aaea05ba289a4b9fe3939a
Neel Parekh [Wed, 30 Sep 2009 18:34:10 +0000 (11:34 -0700)]
am
0803a707: Merge change Iaa0c610a into eclair
Merge commit '
0803a7079507e8be756febe36bb46bfb5531f564' into eclair-plus-aosp
* commit '
0803a7079507e8be756febe36bb46bfb5531f564':
Hookup building the contact header widget from deltas.
Mike Cleron [Wed, 30 Sep 2009 18:34:06 +0000 (11:34 -0700)]
am
0e81dbd4: Merge change I623d3ba1 into eclair
Merge commit '
0e81dbd40bf92a20bce410508b15c71e68f70eaa' into eclair-plus-aosp
* commit '
0e81dbd40bf92a20bce410508b15c71e68f70eaa':
Placeholder mdpi assets
Android (Google) Code Review [Wed, 30 Sep 2009 18:26:09 +0000 (14:26 -0400)]
Merge change Iaa0c610a into eclair
* changes:
Hookup building the contact header widget from deltas.
Android (Google) Code Review [Wed, 30 Sep 2009 18:19:04 +0000 (14:19 -0400)]
Merge change I623d3ba1 into eclair
* changes:
Placeholder mdpi assets
Daisuke Miyakawa [Wed, 30 Sep 2009 18:17:27 +0000 (11:17 -0700)]
am
7370d42d: Merge change I0bb240dc into eclair
Merge commit '
7370d42daae201f63093c4b4e84301af70af6ce9' into eclair-plus-aosp
* commit '
7370d42daae201f63093c4b4e84301af70af6ce9':
Fix a sample code commented out, complying with the new vCard implementation.
Android (Google) Code Review [Wed, 30 Sep 2009 18:12:05 +0000 (14:12 -0400)]
Merge change I0bb240dc into eclair
* changes:
Fix a sample code commented out, complying with the new vCard implementation.
Daisuke Miyakawa [Wed, 30 Sep 2009 18:07:12 +0000 (11:07 -0700)]
Fix a sample code commented out, complying with the new vCard implementation.
Mike Cleron [Wed, 30 Sep 2009 18:02:59 +0000 (11:02 -0700)]
Placeholder mdpi assets
Evan Millar [Wed, 30 Sep 2009 17:14:18 +0000 (10:14 -0700)]
am
20e07eda: Adjust to FasttrackBadgeWidget->QuickContactBadge name change.
Merge commit '
20e07edacad4a696956bd55c9459ea869ee2f45b' into eclair-plus-aosp
* commit '
20e07edacad4a696956bd55c9459ea869ee2f45b':
Adjust to FasttrackBadgeWidget->QuickContactBadge name change.
Daisuke Miyakawa [Wed, 30 Sep 2009 17:14:14 +0000 (10:14 -0700)]
am
a1f0661f: Fix string, again..
Merge commit '
a1f0661fa0c83174700247f8ccda7b4cdad3c78e' into eclair-plus-aosp
* commit '
a1f0661fa0c83174700247f8ccda7b4cdad3c78e':
Fix string, again..
Neel Parekh [Mon, 21 Sep 2009 23:57:03 +0000 (16:57 -0700)]
Hookup building the contact header widget from deltas.
Bug:
2126659
Evan Millar [Wed, 30 Sep 2009 01:00:05 +0000 (18:00 -0700)]
Adjust to FasttrackBadgeWidget->QuickContactBadge name change.
Change-Id: If4d85018dfe4488d46a0eed748314b5d448d2494
Daisuke Miyakawa [Wed, 30 Sep 2009 16:53:49 +0000 (09:53 -0700)]
Fix string, again..
Daisuke Miyakawa [Wed, 30 Sep 2009 16:53:21 +0000 (09:53 -0700)]
am
36966326: Fix error message shown when there\'s no vCard in SD card.
Merge commit '
3696632638d1cb142d47f2a13d219cecb40e2f8c' into eclair-plus-aosp
* commit '
3696632638d1cb142d47f2a13d219cecb40e2f8c':
Fix error message shown when there's no vCard in SD card.
Daisuke Miyakawa [Wed, 30 Sep 2009 16:43:58 +0000 (09:43 -0700)]
Fix error message shown when there's no vCard in SD card.
Internal Issue number:
2155357
Tadashi G. Takaoka [Wed, 30 Sep 2009 16:03:10 +0000 (09:03 -0700)]
am
78ad85e5: Revert "Hide contact context from fast track window in the contacts view"
Merge commit '
78ad85e5e51f2e05ae4142324c98fae9f137eb37' into eclair-plus-aosp
* commit '
78ad85e5e51f2e05ae4142324c98fae9f137eb37':
Revert "Hide contact context from fast track window in the contacts view"
Tadashi G. Takaoka [Tue, 29 Sep 2009 15:22:37 +0000 (08:22 -0700)]
Revert "Hide contact context from fast track window in the contacts view"
This reverts commit
f493b768816f245ccf593953a743996e1a54055a.
Internal Bug:
2138745