OSDN Git Service
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
Jeff Sharkey [Tue, 29 Sep 2009 18:14:17 +0000 (11:14 -0700)]
am
5d920ba5: am
99b1db73: Invalidate sources cache when accounts change.
Merge commit '
5d920ba5e32686b4a376845e32387ce07e71536e'
* commit '
5d920ba5e32686b4a376845e32387ce07e71536e':
Invalidate sources cache when accounts change.
Neel Parekh [Tue, 29 Sep 2009 18:14:03 +0000 (11:14 -0700)]
am
12fc43c2: am
2148e6bd: Merge change I3aaf0497 into eclair
Merge commit '
12fc43c24ad73c53a58ff01a9e056225418f3a21'
* commit '
12fc43c24ad73c53a58ff01a9e056225418f3a21':
Show a header containing the total number of contacts.
Jeff Sharkey [Tue, 29 Sep 2009 18:13:54 +0000 (11:13 -0700)]
am
bcd3b9db: am
93049319: Use separate API when sending vCard through ACTION_SEND.
Merge commit '
bcd3b9dba07e9b02d51ed20dd85c9829f0344ec4'
* commit '
bcd3b9dba07e9b02d51ed20dd85c9829f0344ec4':
Use separate API when sending vCard through ACTION_SEND.
Tadashi G. Takaoka [Tue, 29 Sep 2009 18:13:32 +0000 (11:13 -0700)]
am
055d66f0: am
33aa1c6b: Contacts: added source account name to view/edit activity.
Merge commit '
055d66f069807ed8729a65707e795dc4a10e1bd6'
* commit '
055d66f069807ed8729a65707e795dc4a10e1bd6':
Contacts: added source account name to view/edit activity.
Neel Parekh [Tue, 29 Sep 2009 18:13:29 +0000 (11:13 -0700)]
am
e7e6ea07: am
5b835898: Merge change I778df15f into eclair
Merge commit '
e7e6ea0734c9db23d4eadae54777b50c6ba07d25'
* commit '
e7e6ea0734c9db23d4eadae54777b50c6ba07d25':
Create a title on long press in view contact
Megha Joshi [Tue, 29 Sep 2009 18:11:24 +0000 (11:11 -0700)]
am
a9233449: am
e22b5343: Merge change Ifcd23efc into eclair
Merge commit '
a92334496d572b418e2a9c45b5d06bd3f457631a'
* commit '
a92334496d572b418e2a9c45b5d06bd3f457631a':
Prevents empty contacts from being saved.
Vasu Nori [Tue, 29 Sep 2009 18:10:15 +0000 (11:10 -0700)]
am
da06e422: am
d5e520a1: display text "no matching contacts found" if none found while searching contacts
Merge commit '
da06e422e2deff51eb0881f1747f6ac5be1827a8'
* commit '
da06e422e2deff51eb0881f1747f6ac5be1827a8':
display text "no matching contacts found" if none found while searching contacts
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 17:07:34 +0000 (10:07 -0700)]
Dmitri Plotnikov [Mon, 28 Sep 2009 17:04:44 +0000 (10:04 -0700)]
am
669c5525: am
56045d4a: Renaming Presence and Presence-related columns.
Merge commit '
669c5525fb8794849f831c69a74896b801c2efdf'
* commit '
669c5525fb8794849f831c69a74896b801c2efdf':
Renaming Presence and Presence-related columns.
Nicolas Catania [Mon, 28 Sep 2009 17:04:16 +0000 (10:04 -0700)]
am
168a4ed7: am
6bfd18de: Added annotation for the newly created test\'s size.
Merge commit '
168a4ed748132e8953c25b9bf284ebdfd55647d2'
* commit '
168a4ed748132e8953c25b9bf284ebdfd55647d2':
Added annotation for the newly created test's size.
Nicolas Catania [Mon, 28 Sep 2009 17:02:57 +0000 (10:02 -0700)]
am
7ad45756: am
177d88f8: New theme for the dialtacts activity (no shadow/no title)
Merge commit '
7ad45756a182aba560c6b60a5b959abed901909a'
* commit '
7ad45756a182aba560c6b60a5b959abed901909a':
New theme for the dialtacts activity (no shadow/no title)
Nicolas Catania [Mon, 28 Sep 2009 17:00:40 +0000 (10:00 -0700)]
am
fa334192: am
e291627b: Merge change 26967 into eclair
Merge commit '
fa334192d2abe18249bdce57bab68cc4a75734a8'
* commit '
fa334192d2abe18249bdce57bab68cc4a75734a8':
Disable the call icon in the logs for private and unknown numbers.
Tadashi G. Takaoka [Mon, 28 Sep 2009 17:00:36 +0000 (10:00 -0700)]
am
b23f4fd0: (-s ours) am
6971f2ae: Contacts: removed stale translation strings.
Merge commit '
b23f4fd00124c3027da6668e2e48df43a25594cd'
* commit '
b23f4fd00124c3027da6668e2e48df43a25594cd':
Contacts: removed stale translation strings.
Evan Millar [Mon, 28 Sep 2009 17:00:33 +0000 (10:00 -0700)]
am
b2c371ce: am
9cd81245: Save show sources/hide sources on orientation change.`
Merge commit '
b2c371ce4b3c59532744b0753cb411a40d2d27d7'
* commit '
b2c371ce4b3c59532744b0753cb411a40d2d27d7':
Save show sources/hide sources on orientation change.`
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.
Evan Millar [Mon, 28 Sep 2009 08:09:14 +0000 (01:09 -0700)]
Evan Millar [Mon, 28 Sep 2009 08:08:30 +0000 (01:08 -0700)]
am
2e992f42: am
fd81f431: Adjust to ContactHeaderWidget api changes.
Merge commit '
2e992f421af355b8bf94ff21291cb88597953592'
* commit '
2e992f421af355b8bf94ff21291cb88597953592':
Adjust to ContactHeaderWidget api changes.
Jeff Sharkey [Mon, 28 Sep 2009 08:07:28 +0000 (01:07 -0700)]
am
68a5173f: am
9893cfe0: Rewrite display groups to persist changes in transaction.
Merge commit '
68a5173fb7c7d60d4ab97585f44b1b66deead9b7'
* commit '
68a5173fb7c7d60d4ab97585f44b1b66deead9b7':
Rewrite display groups to persist changes in transaction.
Roy West [Mon, 28 Sep 2009 08:07:14 +0000 (01:07 -0700)]
am
c45d59cd: am
a5f960cb: Tweak no contacts text to fit better; partial step to display options.
Merge commit '
c45d59cd3de563d04cacb2a33050395ffba0e693'
* commit '
c45d59cd3de563d04cacb2a33050395ffba0e693':
Tweak no contacts text to fit better; partial step to display options.
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.`
Neel Parekh [Sun, 27 Sep 2009 22:40:50 +0000 (15:40 -0700)]
am
8ae54f35: am
212453d3: Merge change 26096 into eclair
Merge commit '
8ae54f35bba7bf7761dd490dbe5fc2b4841a1fc8'
* commit '
8ae54f35bba7bf7761dd490dbe5fc2b4841a1fc8':
Try to do an update before inserting.
Neel Parekh [Sun, 27 Sep 2009 22:40:47 +0000 (15:40 -0700)]
am
9961a22c: am
4b749db9: Merge change 27134 into eclair
Merge commit '
9961a22c87ceb844fb3b426b25f01bb0a1cca0d2'
* commit '
9961a22c87ceb844fb3b426b25f01bb0a1cca0d2':
Make sure we don't get an Out of bounds exception when getting a section.
Fred Quintana [Sun, 27 Sep 2009 22:40:05 +0000 (15:40 -0700)]
am
7dabc550: am
93996364: Merge change 27102 into eclair
Merge commit '
7dabc550c445a38526d7fe1d60d50b83ec24a875'
* commit '
7dabc550c445a38526d7fe1d60d50b83ec24a875':
- fix a crash that happens when reparenting a change
Evan Millar [Sun, 27 Sep 2009 22:39:13 +0000 (15:39 -0700)]
am
cdde9ad8: am
2e1b8afd: Show sources / Hide sources UI in the view card.
Merge commit '
cdde9ad8e2fb51993c2e32713cbe945167584337'
* commit '
cdde9ad8e2fb51993c2e32713cbe945167584337':
Show sources / Hide sources UI in the view card.
Fred Quintana [Sun, 27 Sep 2009 22:36:33 +0000 (15:36 -0700)]
am
9a658abf: am
a6ff67e8: don\'t delete photo rows that have an empty photo
Merge commit '
9a658abfec7e77cfac7f30cdd991181ca4c0259b'
* commit '
9a658abfec7e77cfac7f30cdd991181ca4c0259b':
don't delete photo rows that have an empty photo
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:27:24 +0000 (11:27 -0700)]
am
a81dc6fe: am
8dae2943: Fix divider showing up in contacts list
Merge commit '
a81dc6fef3e5518f05ff9df3b6483b37fc08cd65'
* commit '
a81dc6fef3e5518f05ff9df3b6483b37fc08cd65':
Fix divider showing up in contacts list
Nicolas Catania [Fri, 25 Sep 2009 18:24:36 +0000 (11:24 -0700)]
am
b0819f87: am
a1fa1176: Merge change 26949 into eclair
Merge commit '
b0819f87f727d52d7c8c361d53c32dcfc44c5bc1'
* commit '
b0819f87f727d52d7c8c361d53c32dcfc44c5bc1':
Fixed the font size in the dialer (increased the size).
Roy West [Fri, 25 Sep 2009 18:24:32 +0000 (11:24 -0700)]
am
c3a29c37: am
4a83a6df: Fix bug2143343: Edits to "no contacts" screen in Contacts.
Merge commit '
c3a29c3785adec5ded77122b7d178911456446bc'
* commit '
c3a29c3785adec5ded77122b7d178911456446bc':
Fix bug2143343: Edits to "no contacts" screen in Contacts.
Daisuke Miyakawa [Fri, 25 Sep 2009 18:24:28 +0000 (11:24 -0700)]
am
a278b9eb: am
2a53badf: Make SDCard/SIM importer allows import into "phone-local" account.
Merge commit '
a278b9eb515f1d6f70dc8baffbe125b2f1c6c2cb'
* commit '
a278b9eb515f1d6f70dc8baffbe125b2f1c6c2cb':
Make SDCard/SIM importer allows import into "phone-local" account.
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
Megha Joshi [Fri, 25 Sep 2009 18:14:26 +0000 (11:14 -0700)]
am
cc78d80b: am
e0253374: Merge change 26787 into eclair
Merge commit '
cc78d80b8a957e92b7e1c518ed673520e2132081'
* commit '
cc78d80b8a957e92b7e1c518ed673520e2132081':
Fixes DisplayGroups to not show sync options for account types
Evan Millar [Fri, 25 Sep 2009 18:14:22 +0000 (11:14 -0700)]
android-build SharedAccount [Fri, 25 Sep 2009 18:08:21 +0000 (11:08 -0700)]
am
c95c1415: am
7e1690ae: Revert "clear PHOTO column instead of deleting the row for focus"
Merge commit '
c95c1415f4d36a3207b16686cf7fc70000ae3af5'
* commit '
c95c1415f4d36a3207b16686cf7fc70000ae3af5':
Revert "clear PHOTO column instead of deleting the row for focus"
Neel Parekh [Thu, 24 Sep 2009 23:37:47 +0000 (16:37 -0700)]
Fix divider showing up in contacts list
Neel Parekh [Fri, 25 Sep 2009 18:07:07 +0000 (11:07 -0700)]
am
3c39c312: am
f493b768: Hide contact context from fast track window in the contacts view
Merge commit '
3c39c312ef4aa402a97e0e64b67181ef375636ac'
* commit '
3c39c312ef4aa402a97e0e64b67181ef375636ac':
Hide contact context from fast track window in the contacts view
Neel Parekh [Fri, 25 Sep 2009 18:07:03 +0000 (11:07 -0700)]
am
8c6aa38f: am
fdac311e: Merge change 26770 into eclair
Merge commit '
8c6aa38f1afbab04deea26c6767cdebfc0838aed'
* commit '
8c6aa38f1afbab04deea26c6767cdebfc0838aed':
Show a line at the bottom of favorites.
Nicolas Catania [Fri, 25 Sep 2009 18:06:15 +0000 (11:06 -0700)]
am
7255d929: am
6b3711cd: Merge change 26858 into eclair
Merge commit '
7255d929a8d41ef0b737f538a3f92769c4307df1'
* commit '
7255d929a8d41ef0b737f538a3f92769c4307df1':
Changed the 'dialer' string to 'phone' in the tab and app name.
Megha Joshi [Fri, 25 Sep 2009 18:04:29 +0000 (11:04 -0700)]
am
a6006686: am
e5845342: Merge change 26772 into eclair
Merge commit '
a60066867e2075db28186193ae3a099e0c4d0b01'
* commit '
a60066867e2075db28186193ae3a099e0c4d0b01':
Fixes the issue about fasttrack window not being
Megha Joshi [Fri, 25 Sep 2009 18:04:25 +0000 (11:04 -0700)]
am
ddc3dbc7: am
064a0a81: Change display order of account name, account type in create contact under account dialog.
Merge commit '
ddc3dbc7d3e3f85c69ce800180af796a5425fc65'
* commit '
ddc3dbc7d3e3f85c69ce800180af796a5425fc65':
Change display order of account name, account type in create
Jeff Sharkey [Fri, 25 Sep 2009 18:02:41 +0000 (11:02 -0700)]
am
945048ed: am
22678e77: Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Merge commit '
945048ed1cbc87d081d95cc9e15e841781115f6a'
* commit '
945048ed1cbc87d081d95cc9e15e841781115f6a':
Delay updating of Contacts.IN_VISIBLE_GROUP until finished.
Jeff Sharkey [Fri, 25 Sep 2009 18:02:37 +0000 (11:02 -0700)]
am
40cda355: am
edb54bc2: Merge change 26813 into eclair
Merge commit '
40cda3551266e4d14d8d40b2d2e5a39dbcd2df96'
* commit '
40cda3551266e4d14d8d40b2d2e5a39dbcd2df96':
Compare rawContactIds using actual number value.
Daisuke Miyakawa [Fri, 25 Sep 2009 18:02:14 +0000 (11:02 -0700)]
am
e87229d2: am
7979833d: Merge change 26710 into eclair
Merge commit '
e87229d2e794554b8020d9d57b149e2e615c2289'
* commit '
e87229d2e794554b8020d9d57b149e2e615c2289':
Delay the type value change until the custom value is correct.
Jeff Sharkey [Fri, 25 Sep 2009 18:02:04 +0000 (11:02 -0700)]
am
4db98fa9: am
54c69bbd: Bring back EAS assistant name editor.
Merge commit '
4db98fa951b938deed6b6acd14b60e77ec7d749a'
* commit '
4db98fa951b938deed6b6acd14b60e77ec7d749a':
Bring back EAS assistant name editor.