| 45b023e89d87b66e44c1b79c6e1444ec9db70a82 |
|
06-Aug-2013 |
Yorke Lee <yorkelee@google.com> |
Handle DEMOTE and UNDEMOTE in CP2
* If a contact is UNDEMOTED, if it was previously DEMOTED, it will
become UNPINNED. Otherwise, it will remain unchanged.
* When two raw contacts are aggregated, the parent contact should
inherit the lower pinned position of the two, not including negative
integers.
Change-Id: I74f41dfa327b8e5a79688b1e99eafbef7d9d58a0
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 81fea08280784b319b936a3506788d595c6ce2ad |
|
18-Jul-2013 |
Yorke Lee <yorkelee@google.com> |
Add pinning support in ContactsProvider
Change-Id: I3c835c2fd0faf99f8fb176752cfcb12e011095a2
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 8ed367fdc0b086d54c489f68d555e2f0a4035f63 |
|
12-Mar-2013 |
Chiao Cheng <chiaocheng@google.com> |
Adding contacts delta api.
Updates and inserts can be detected through the use of a new timestamp
field in the contacts table.
Deletes can be detected by querying the new deleted_contacts table.
Bug: 8182147
Change-Id: I5c1e596f4e1aa58528afc29396f79cb4051e229c
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 38210445730ee04c351c7cc1b3800cfe23e34325 |
|
27-Jun-2012 |
Makoto Onuki <omakoto@google.com> |
Reorganize import in contacts provider
Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 64ee95a3e48d6f83e338764650c53a915b778cdf |
|
13-Jun-2012 |
Makoto Onuki <omakoto@google.com> |
am a499a2ad: Merge "Fix aggregation exception problem"
* commit 'a499a2adb856223de65d298cd93d70c85afe3d4d':
Fix aggregation exception problem
|
| 89f033e186043aeacaf16f73df44f2e0e6a106fa |
|
26-Apr-2012 |
Makoto Onuki <omakoto@google.com> |
Don't suggest invisible for aggregation
Bug 6400450
Change-Id: I4b5ed4a331f6740c3954b232633076e60e1de140
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 9d9994ea8f6b02d2c1afb48a9d776c4c26d6c989 |
|
23-Apr-2012 |
Makoto Onuki <omakoto@google.com> |
Merge "New aggregation logic"
|
| 0992b9d4969ed0eee6e879db94292b635229e2b7 |
|
11-Apr-2012 |
Makoto Onuki <omakoto@google.com> |
New aggregation logic
Now a raw contact can be merged into a contact containing raw contacts from
the same account if there's at least one raw contact in those raw contacts
that shares at least one email address, phone number, or identity.
Now the aggregation logic version is 3.
Also:
- Make sure changes to the identity triggers aggregation.
- Stop re-using some HashMaps/HashSets, as they don't shirink the internal
table when clear()ed. During the aggregation update we may put a bunch of
stuff into those, and we want to make sure that we don't keep unnecessarily
bit internal tables after the upgrade. This should be okay with the modern
dalvik GC.
Change-Id: I855085d334679363cf9bffb918ca2ceb0cfe77f5
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| c23a30e0510cf56d1dafddc79d1ab99ae9297a3f |
|
12-Apr-2012 |
Makoto Onuki <omakoto@google.com> |
Fix most of photo tests
Adjusting existing unit tests for higher res photos turned out to be tricky,
because the size of the test images were selected for 256x256.
(e.g. cropping tests)
Also we don't want the display photo size to change depending on the running
device.
So let's just keep using 256x256 for all unit tests.
Added new asserts to EvenMoreAssert to compare image raw data, which prints
actual/expected dimensions when it fails.
Even with this CL, ContactsProvider2Test.testInputStreamForPhoto() still fails
with the following assert message. The image size seems to be correct, so I'm
not sure why. This may be because we've changed the compression rate, but
I didn't dig into it.
"Different data lengths: expected=1088 actual=1578,
expected dimentions=[96 x 96] actual dimentions=[96 x 96]"
Anyway, with this CL at least PhotoStoreTest will no longer crash, so let's
merge it now and take care of the failing test later.
Change-Id: I935f76acee3c2de99030c62e14f43de07074fb8a
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 81567f4a0f7c9c338506bd82f4d33e83c2ccf159 |
|
23-Mar-2012 |
Makoto Onuki <omakoto@google.com> |
Add new package aggregation.util
Move aggregator related classes into it.
Change-Id: I712fe07ad2bab1e532e3822e3e2797a199329865
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|
| 49ed71913609193a00059df944f6259e9397b0bd |
|
05-Mar-2012 |
Makoto Onuki <omakoto@google.com> |
Move aggregator to its own package
... so that methods used only by ProfileAggregator don't have to be public.
And fix some method visibilities that don't make sense.
Needed to change the bogus ID in PhotoStoreTest; otherwise moving the
aggregator test will make this test fail for some unclear reason.
Bug 6118852
Change-Id: Ic0c022cbf50128f40c70559c1a7cf8e2a6c06fc8
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator.java
|