OSDN Git Service
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.
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
Neel Parekh [Tue, 29 Sep 2009 19:33:19 +0000 (12:33 -0700)]
Make total contacts header more like a separator.
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
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.
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.
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!!!
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!!!
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
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
Dmitri Plotnikov [Tue, 29 Sep 2009 19:04:28 +0000 (12:04 -0700)]
[Issue
2149076] Wording cleanup on contacts Display Options
Change-Id: Ibb10a3d9a7735d3bb3005aa188cf43877cc955f1
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.
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.
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.
Tadashi G. Takaoka [Tue, 29 Sep 2009 16:12:46 +0000 (09:12 -0700)]
Do not show "star" in contact editor.
Internal Bug:
2147622
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
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
Android (Google) Code Review [Tue, 29 Sep 2009 07:05:08 +0000 (03:05 -0400)]
Merge change I1dd85cfe into eclair
* changes:
New icons
Mike Cleron [Tue, 29 Sep 2009 07:03:17 +0000 (00:03 -0700)]
New icons
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
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
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
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
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
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
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.
Jeff Sharkey [Tue, 29 Sep 2009 03:16:37 +0000 (20:16 -0700)]
Remove TYPE_CUSTOM from EAS source.
Helps fix http://b/
2127721
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
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.
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.
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.
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
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.
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.
Neel Parekh [Tue, 29 Sep 2009 00:19:03 +0000 (17:19 -0700)]
Show a header containing the total number of contacts.
Bug:
2138779
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.
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
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.
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
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
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
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.
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.
Megha Joshi [Sat, 26 Sep 2009 22:46:49 +0000 (15:46 -0700)]
Prevents empty contacts from being saved.
Fixes
2128988
Vasu Nori [Mon, 28 Sep 2009 22:08:07 +0000 (15:08 -0700)]
am
d5e520a1: display text "no matching contacts found" if none found while searching contacts
Merge commit '
d5e520a171aa4a2ac313f83d8a6b8d27be746308' into eclair-plus-aosp
* commit '
d5e520a171aa4a2ac313f83d8a6b8d27be746308':
display text "no matching contacts found" if none found while searching contacts
Vasu Nori [Mon, 28 Sep 2009 21:31:02 +0000 (14:31 -0700)]
display text "no matching contacts found" if none found while searching contacts
Neel Parekh [Sat, 26 Sep 2009 01:05:18 +0000 (18:05 -0700)]
Create a title on long press in view contact
Bug:
2138724
Daisuke Miyakawa [Mon, 28 Sep 2009 16:31:48 +0000 (09:31 -0700)]
am
0bec3b9b: Several changes included...
Merge commit '
0bec3b9bd74f295f4a6e3279e849404fb022e753' into eclair-plus-aosp
* commit '
0bec3b9bd74f295f4a6e3279e849404fb022e753':
Several changes included...
Daisuke Miyakawa [Fri, 25 Sep 2009 20:33:27 +0000 (13:33 -0700)]
Several changes included...
- Suppress RuntimeException reported in the issue
2145361
-- Ask the parent Activity to show messages.
- Make vCard exporter a separated Activity.
-- There's no need to do this any more, but looks cleaner and easier to
understand the behavior.
- Make error messages from vCard composer translatable.
- Stop using showDialog() when it is not appropriate.
Dmitri Plotnikov [Mon, 28 Sep 2009 02:59:57 +0000 (19:59 -0700)]
am
56045d4a: Renaming Presence and Presence-related columns.
Merge commit '
56045d4a248f82ab0ca3ba2d9df2d3c2aeb4b075' into eclair-plus-aosp
* commit '
56045d4a248f82ab0ca3ba2d9df2d3c2aeb4b075':
Renaming Presence and Presence-related columns.
Dmitri Plotnikov [Mon, 28 Sep 2009 00:36:11 +0000 (17:36 -0700)]
Renaming Presence and Presence-related columns.
Change-Id: If5bfe3d88203cc1dabd81a65ca96e81be193ce71
Nicolas Catania [Mon, 28 Sep 2009 02:41:10 +0000 (19:41 -0700)]
am
6bfd18de: Added annotation for the newly created test\'s size.
Merge commit '
6bfd18de4c928f929bbe02c4af8447108660dcdf' into eclair-plus-aosp
* commit '
6bfd18de4c928f929bbe02c4af8447108660dcdf':
Added annotation for the newly created test's size.
Nicolas Catania [Fri, 25 Sep 2009 00:30:27 +0000 (17:30 -0700)]
Added annotation for the newly created test's size.
Made it a medium test (3 secs to run + in mem sql provider + activity)
Nicolas Catania [Mon, 28 Sep 2009 01:10:47 +0000 (18:10 -0700)]
am
177d88f8: New theme for the dialtacts activity (no shadow/no title)
Merge commit '
177d88f87f9a96d42f43a202a39c8cead4a563c0' into eclair-plus-aosp
* commit '
177d88f87f9a96d42f43a202a39c8cead4a563c0':
New theme for the dialtacts activity (no shadow/no title)
Nicolas Catania [Sun, 27 Sep 2009 22:15:05 +0000 (15:15 -0700)]
New theme for the dialtacts activity (no shadow/no title)
This brings the tabs and text dial in line with the UI mocks.
Note that it is still consistent with traditional UIs where
the title and notification bar are on the same z-index, it
is just that a tab activity's title is the active tab.
Bug
2104523
Nicolas Catania [Sun, 27 Sep 2009 23:54:05 +0000 (16:54 -0700)]
am
e291627b: Merge change 26967 into eclair
Merge commit '
e291627b8c0d0a69d77a9fd0a37cdb48349d52f6' into eclair-plus-aosp
* commit '
e291627b8c0d0a69d77a9fd0a37cdb48349d52f6':
Disable the call icon in the logs for private and unknown numbers.
Tadashi G. Takaoka [Sun, 27 Sep 2009 23:53:43 +0000 (16:53 -0700)]
am
6971f2ae: Contacts: removed stale translation strings.
Merge commit '
6971f2ae45bbb2d89f22358e54afb9e7ccd5754d' into eclair-plus-aosp
* commit '
6971f2ae45bbb2d89f22358e54afb9e7ccd5754d':
Contacts: removed stale translation strings.
Evan Millar [Sun, 27 Sep 2009 23:53:39 +0000 (16:53 -0700)]
am
9cd81245: Save show sources/hide sources on orientation change.`
Merge commit '
9cd812451931df221d39f69169b11a958c070713' into eclair-plus-aosp
* commit '
9cd812451931df221d39f69169b11a958c070713':
Save show sources/hide sources on orientation change.`
Android (Google) Code Review [Sun, 27 Sep 2009 22:34:50 +0000 (18:34 -0400)]
Merge change 26967 into eclair
* changes:
Disable the call icon in the logs for private and unknown numbers.
Tadashi G. Takaoka [Sun, 27 Sep 2009 17:18:46 +0000 (10:18 -0700)]
Contacts: removed stale translation strings.
DO NOT MERGE to master
Nicolas Catania [Fri, 25 Sep 2009 00:30:27 +0000 (17:30 -0700)]
Disable the call icon in the logs for private and unknown numbers.
We cannot callback private numbers (ie number with a caller id blocked)
so we need to disable the call icon.
Same for Unknown ones (e.g private number on GSM shows as unknown).
Added a test to make sure call icon is not visible on the right entries.
Bug:
2144575
Evan Millar [Sat, 26 Sep 2009 23:02:31 +0000 (16:02 -0700)]
Save show sources/hide sources on orientation change.`
Change-Id: Ib5a58b09f13de9ddd4be048788228928fd591f53
Evan Millar [Sat, 26 Sep 2009 22:32:20 +0000 (15:32 -0700)]
Evan Millar [Sat, 26 Sep 2009 22:23:37 +0000 (15:23 -0700)]
Fix http://b/issue?id=
2098463
Change-Id: I04d4da9dfc70a16c547efd4c4331dd910788e9e4
Evan Millar [Sat, 26 Sep 2009 20:40:06 +0000 (13:40 -0700)]
am
fd81f431: Adjust to ContactHeaderWidget api changes.
Merge commit '
fd81f43182b4645bfaebfb7d5b10ad5ae341ed9a' into eclair-plus-aosp
* commit '
fd81f43182b4645bfaebfb7d5b10ad5ae341ed9a':
Adjust to ContactHeaderWidget api changes.
Evan Millar [Wed, 23 Sep 2009 19:05:30 +0000 (12:05 -0700)]
Adjust to ContactHeaderWidget api changes.
Change-Id: I34d77fa00421951cef0dc62d33982be6aa06b644
Jeff Sharkey [Sat, 26 Sep 2009 12:35:09 +0000 (05:35 -0700)]
am
9893cfe0: Rewrite display groups to persist changes in transaction.
Merge commit '
9893cfe05a915db0378052c47981250f85a3ae19' into eclair-plus-aosp
* commit '
9893cfe05a915db0378052c47981250f85a3ae19':
Rewrite display groups to persist changes in transaction.
Jeff Sharkey [Sat, 26 Sep 2009 08:57:35 +0000 (01:57 -0700)]
Rewrite display groups to persist changes in transaction.
In a previous change we relied on now-removed query
parameters to delay visibility updates until forced through
a specific update. This would leave the contacts list in
a stale state when the user left the Activity through
non-typical methods, such as notification or home key.
This change keeps all user edits in memory, reusing code
from our edit UI, and persisting them in as a single
transaction when finished. This also adds a button bar
to help confirm or revert changes. Fixes http://b/
2075275
In addition, this change cleans up inefficient code where
we had been previously joining together up to 3 cursors for
each account to match a given UI spec.
Roy West [Sat, 26 Sep 2009 09:04:51 +0000 (02:04 -0700)]
am
a5f960cb: Tweak no contacts text to fit better; partial step to display options.
Merge commit '
a5f960cb5d4c821c0a9df7fabd91206d5c3c4002' into eclair-plus-aosp
* commit '
a5f960cb5d4c821c0a9df7fabd91206d5c3c4002':
Tweak no contacts text to fit better; partial step to display options.
Roy West [Fri, 25 Sep 2009 20:25:13 +0000 (13:25 -0700)]
Tweak no contacts text to fit better; partial step to display options.
Neel Parekh [Fri, 25 Sep 2009 22:55:23 +0000 (15:55 -0700)]
am
212453d3: Merge change 26096 into eclair
Merge commit '
212453d3cb8f82313729b0e95e481cb1c06724ac' into eclair-plus-aosp
* commit '
212453d3cb8f82313729b0e95e481cb1c06724ac':
Try to do an update before inserting.
Neel Parekh [Fri, 25 Sep 2009 22:55:19 +0000 (15:55 -0700)]
am
4b749db9: Merge change 27134 into eclair
Merge commit '
4b749db9a27a49f61cca28f9bbac529c7b1257e3' into eclair-plus-aosp
* commit '
4b749db9a27a49f61cca28f9bbac529c7b1257e3':
Make sure we don't get an Out of bounds exception when getting a section.
Android (Google) Code Review [Fri, 25 Sep 2009 22:48:19 +0000 (18:48 -0400)]
Merge change 26096 into eclair
* changes:
Try to do an update before inserting.
Android (Google) Code Review [Fri, 25 Sep 2009 22:18:22 +0000 (18:18 -0400)]
Merge change 27134 into eclair
* changes:
Make sure we don't get an Out of bounds exception when getting a section.
Fred Quintana [Fri, 25 Sep 2009 22:15:18 +0000 (15:15 -0700)]
am
93996364: Merge change 27102 into eclair
Merge commit '
939963647fbcce9bb57ebe5e299629060393bdfd' into eclair-plus-aosp
* commit '
939963647fbcce9bb57ebe5e299629060393bdfd':
- fix a crash that happens when reparenting a change
Android (Google) Code Review [Fri, 25 Sep 2009 22:10:47 +0000 (18:10 -0400)]
Merge change 27102 into eclair
* changes:
- fix a crash that happens when reparenting a change - fix a bug wher to Longs are compared using == instead of equals
Evan Millar [Fri, 25 Sep 2009 21:39:39 +0000 (14:39 -0700)]
am
2e1b8afd: Show sources / Hide sources UI in the view card.
Merge commit '
2e1b8afd3ad0a30ab5bb56d5310a2a7c7bc6d653' into eclair-plus-aosp
* commit '
2e1b8afd3ad0a30ab5bb56d5310a2a7c7bc6d653':
Show sources / Hide sources UI in the view card.
Fred Quintana [Fri, 25 Sep 2009 20:13:35 +0000 (13:13 -0700)]
- fix a crash that happens when reparenting a change
- fix a bug wher to Longs are compared using == instead of equals
Neel Parekh [Fri, 25 Sep 2009 21:26:20 +0000 (14:26 -0700)]
Make sure we don't get an Out of bounds exception when getting a section.
Evan Millar [Thu, 24 Sep 2009 16:39:21 +0000 (09:39 -0700)]
Show sources / Hide sources UI in the view card.
Change-Id: Iee14c66c0b9b065403778c6b8e4cb1273a02ee65
Fred Quintana [Fri, 25 Sep 2009 19:07:08 +0000 (12:07 -0700)]
am
a6ff67e8: don\'t delete photo rows that have an empty photo
Merge commit '
a6ff67e83082c7953d3b70181549ff4cabce2eba' into eclair-plus-aosp
* commit '
a6ff67e83082c7953d3b70181549ff4cabce2eba':
don't delete photo rows that have an empty photo
Fred Quintana [Fri, 25 Sep 2009 00:15:49 +0000 (17:15 -0700)]
don't delete photo rows that have an empty photo
Neel Parekh [Fri, 25 Sep 2009 18:14:45 +0000 (11:14 -0700)]
am
8dae2943: Fix divider showing up in contacts list
Merge commit '
8dae2943fb510e5ffd12111e312c31c272e6bc79' into eclair-plus-aosp
* commit '
8dae2943fb510e5ffd12111e312c31c272e6bc79':
Fix divider showing up in contacts list
Neel Parekh [Thu, 24 Sep 2009 23:37:47 +0000 (16:37 -0700)]
Fix divider showing up in contacts list
Nicolas Catania [Fri, 25 Sep 2009 15:05:05 +0000 (08:05 -0700)]
am
a1fa1176: Merge change 26949 into eclair
Merge commit '
a1fa11763b48e0d7200f349c5236606b9eb0ee36' into eclair-plus-aosp
* commit '
a1fa11763b48e0d7200f349c5236606b9eb0ee36':
Fixed the font size in the dialer (increased the size).
Roy West [Fri, 25 Sep 2009 15:05:02 +0000 (08:05 -0700)]
am
4a83a6df: Fix bug2143343: Edits to "no contacts" screen in Contacts.
Merge commit '
4a83a6dfc159fc04f73bfb00991c7a313bc105a8' into eclair-plus-aosp
* commit '
4a83a6dfc159fc04f73bfb00991c7a313bc105a8':
Fix bug2143343: Edits to "no contacts" screen in Contacts.
Daisuke Miyakawa [Fri, 25 Sep 2009 15:04:58 +0000 (08:04 -0700)]
am
2a53badf: Make SDCard/SIM importer allows import into "phone-local" account.
Merge commit '
2a53badf9e15996e75584ecc81734a409b8b89e9' into eclair-plus-aosp
* commit '
2a53badf9e15996e75584ecc81734a409b8b89e9':
Make SDCard/SIM importer allows import into "phone-local" account.
Android (Google) Code Review [Fri, 25 Sep 2009 15:00:26 +0000 (11:00 -0400)]
Merge change 26949 into eclair
* changes:
Fixed the font size in the dialer (increased the size).
Roy West [Fri, 25 Sep 2009 14:25:03 +0000 (07:25 -0700)]
Fix bug2143343: Edits to "no contacts" screen in Contacts.
Neel Parekh [Mon, 21 Sep 2009 02:08:50 +0000 (19:08 -0700)]
Try to do an update before inserting.
Daisuke Miyakawa [Thu, 24 Sep 2009 02:03:16 +0000 (19:03 -0700)]
Make SDCard/SIM importer allows import into "phone-local" account.
Also make importer try to create "My Contacts" group if it does not exist in
the Google account.
Note that the code for the issue
2138187 is also added but temporaly commented out.
I agree this is not clean change, but please ignore these now.
I'll comment in them soon...
Internal issue number:
2141766
Megha Joshi [Thu, 24 Sep 2009 23:54:08 +0000 (16:54 -0700)]
am
e0253374: Merge change 26787 into eclair
Merge commit '
e02533748eeca6bd9e37926128495c3cb5503068' into eclair-plus-aosp
* commit '
e02533748eeca6bd9e37926128495c3cb5503068':
Fixes DisplayGroups to not show sync options for account types
Evan Millar [Thu, 24 Sep 2009 23:53:59 +0000 (16:53 -0700)]
Android (Google) Code Review [Thu, 24 Sep 2009 23:47:59 +0000 (19:47 -0400)]
Merge change 26787 into eclair
* changes:
Fixes DisplayGroups to not show sync options for account types that don't support sync.
Evan Millar [Thu, 24 Sep 2009 23:45:09 +0000 (16:45 -0700)]
Fix http://b/issue?id=
2144841
Change-Id: I0955ceaeff76be5912e1add68d40b233d565b0d4
Nicolas Catania [Thu, 24 Sep 2009 23:27:05 +0000 (16:27 -0700)]
Fixed the font size in the dialer (increased the size).
Looks good on sh... and dream.
Bug:
2104523
Megha Joshi [Thu, 24 Sep 2009 22:21:19 +0000 (15:21 -0700)]
Fixes DisplayGroups to not show sync options for account types
that don't support sync.
Bug:
2126681
Conflicts:
src/com/android/contacts/ui/DisplayGroupsActivity.java
android-build SharedAccount [Thu, 24 Sep 2009 19:20:15 +0000 (12:20 -0700)]
am
7e1690ae: Revert "clear PHOTO column instead of deleting the row for focus"
Merge commit '
7e1690ae43dc2cf310031e75a78b6d372adb7c0c' into eclair-plus-aosp
* commit '
7e1690ae43dc2cf310031e75a78b6d372adb7c0c':
Revert "clear PHOTO column instead of deleting the row for focus"
android-build SharedAccount [Thu, 24 Sep 2009 19:12:47 +0000 (12:12 -0700)]
Revert "clear PHOTO column instead of deleting the row for focus"
This reverts commit
a3c1b8beda9a79727690889647fdb9f234c760eb, as per Fred.
Neel Parekh [Thu, 24 Sep 2009 17:58:10 +0000 (10:58 -0700)]
am
f493b768: Hide contact context from fast track window in the contacts view
Merge commit '
f493b768816f245ccf593953a743996e1a54055a' into eclair-plus-aosp
* commit '
f493b768816f245ccf593953a743996e1a54055a':
Hide contact context from fast track window in the contacts view