| f3960b1271c65d64f9836894af600948bd804e7c |
|
21-Nov-2009 |
Jeff Hamilton <jham@android.com> |
Remove the IM provider contract class.
Change-Id: Ia644689021aca3e429d42727dfd6262b6986dfd2
/frameworks/base/core/java/android/provider/Contacts.java
|
| 29e4a3c566f435c32f0b95e4ac8e8b33cac6faba |
|
01-Oct-2009 |
Dianne Hackborn <hackbod@google.com> |
Update from API review.
Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
/frameworks/base/core/java/android/provider/Contacts.java
|
| f852698cc3bd40c7a54317a711360bae2606cd2d |
|
24-Sep-2009 |
Jeff Hamilton <jham@android.com> |
Make the new ContactsContract APIs public.
Also, squelch warnings that were caused by the
deprecation of the old Contacts APIs.
Change-Id: I91d2804de4b653003cd5504ff0f770c01a6332ef
/frameworks/base/core/java/android/provider/Contacts.java
|
| 8d570b3a246cbc18be7046763c213b57dcb3e103 |
|
17-Sep-2009 |
Jeff Hamilton <jham@android.com> |
Don't crash if the cursor is null.
Change-Id: Ibbacc97f781c1485599a5e11217527930d97fe2d
/frameworks/base/core/java/android/provider/Contacts.java
|
| 42fc2c6f0af1c6d8160e00d7319a1c6fd0258a6f |
|
15-Sep-2009 |
Jeff Sharkey <jsharkey@android.com> |
Fix NPE when provider returns null cursor.
Fixes http://b/2051283
/frameworks/base/core/java/android/provider/Contacts.java
|
| ba176d6c8ad581e65b46bd6835c0737e74ef453d |
|
26-Aug-2009 |
Jeff Sharkey <jsharkey@android.com> |
Don't reference hidden API from comments.
/frameworks/base/core/java/android/provider/Contacts.java
|
| 534aa012b5063abeaa36b9ade69851add8b7a48f |
|
25-Aug-2009 |
Jeff Sharkey <jsharkey@android.com> |
Mark all legacy contacts APIs as deprecated.
Now that we've merged ContactsContract and are relying on
compatibility mode, we're marking the previous public
contacts API as deprecated.
Fixes http://b/2076016
/frameworks/base/core/java/android/provider/Contacts.java
|
| 1132200fa1f545a34f700d6000ded8c8c56134e4 |
|
05-Jun-2009 |
Jeff Sharkey <jsharkey@android.com> |
Added an extra for sharing a target rectangle extra.
Used to pass a location using screen coordinates when
starting a SHOW_OR_CREATE_CONTACT activity.
/frameworks/base/core/java/android/provider/Contacts.java
|
| dc2da5fd922fc8de0ffcb22df3622b57ed777732 |
|
19-Jun-2009 |
Evan Millar <emillar@google.com> |
Copies the Contacts.Intents class to ContactsContract.
ContactsContract now contains all the useful constants that are
contained in Contacts.Intents. Because we have to continue to
support the Contacts interface, the constants are kept there,
but now simply reference the real versions in Contacts.Intents.
Contacts.Intents will be deprecated and developers are encouraged
to move to Contacts.Intents.
/frameworks/base/core/java/android/provider/Contacts.java
|
| 7c3e18c558820de543e3aa4fb3a777940106166c |
|
19-May-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
resolved conflicts w/ 842a1f4b0beaacfaab940318fe19909e087aae81 merge....
/frameworks/base/core/java/android/provider/Contacts.java
|
| 8ba63601ab3aa4042f8801529cb629450aea4bc3 |
|
19-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 15e74b9d: Merge change 1939 into donut
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'
* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
Fix build breakage
Revise the ImageButton class description to include information
Record statistics about whether HTTP connections are reused.
|
| 6e9610e1dba59bf708b45e0039856d70e6b9768b |
|
19-May-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Fix build breakage
/frameworks/base/core/java/android/provider/Contacts.java
|
| 841ddefcb5720bcc1925f373b66224411f99a9fa |
|
19-May-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Hand merge from cupcake_dcm to donut, part 2.
Modify Contacts-related java files and update vCard importer code to the latest.
/frameworks/base/core/java/android/provider/Contacts.java
|
| d9d2f1140b52fd0c014e9deac59f6000564b7e84 |
|
23-Apr-2009 |
Fred Quintana <fredq@google.com> |
change the sync framework and users to understand Account
/frameworks/base/core/java/android/provider/Contacts.java
|
| 75534fbe246e5562779500bc7cf7f0ddfe9b8330 |
|
14-Apr-2009 |
Dianne Hackborn <> |
Merge branch 'readonly-p4-master'
|
| 935ae463d495d41155e27feb849768ad2b8b16db |
|
14-Apr-2009 |
Dianne Hackborn <> |
AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
/frameworks/base/core/java/android/provider/Contacts.java
|
| f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 |
|
11-Apr-2009 |
Andy Stadler <> |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
/frameworks/base/core/java/android/provider/Contacts.java
|
| f5f8d247d1f216cd590ed788f72d1e4dec0d0e90 |
|
28-Mar-2009 |
Jeffrey Sharkey <> |
AI 143308: am: CL 143159 am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.
Added a new WITH_EMAIL_OR_IM_FILTER_URI to find people with a given string as either an E-mail or IM address. This cleans up the original code, and lets us handle duplicates when there are multiple ContactMethod matches for a single person. (We don't get GROUP BY through the ContentProvider interface.)
In ContactsListActivity we don't show possibly-incorrect labels when in MODE_QUERY_PICK_TO_VIEW, as any labels and values would be identical. (The people appearing in that list are there because their ContactMethod matches the query.)
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143308
/frameworks/base/core/java/android/provider/Contacts.java
|
| e1861133d51b9e6a6f658eb366630ad4f4d3ff8f |
|
27-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
|
| cd1a9ea2388dfd31bb51c27df6404d68e227569c |
|
27-Mar-2009 |
Jeffrey Sharkey <> |
AI 143159: am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.
Added a new WITH_EMAIL_OR_IM_FILTER_URI to find people with a given string as either an E-mail or IM address. This cleans up the original code, and lets us handle duplicates when there are multiple ContactMethod matches for a single person. (We don't get GROUP BY through the ContentProvider interface.)
In ContactsListActivity we don't show possibly-incorrect labels when in MODE_QUERY_PICK_TO_VIEW, as any labels and values would be identical. (The people appearing in that list are there because their ContactMethod matches the query.)
Original author: jsharkey
Merged from: //branches/cupcake/...
Automated import of CL 143159
/frameworks/base/core/java/android/provider/Contacts.java
|
| 5104518fd7db24b0757be336092c94439e847e36 |
|
26-Mar-2009 |
Jeffrey Sharkey <> |
Automated import from //branches/cupcake/...@142855,142855
/frameworks/base/core/java/android/provider/Contacts.java
|
| 105925376f8d0f6b318c9938c7b83ef7fef094da |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/frameworks/base/core/java/android/provider/Contacts.java
|
| 2a73de7b21a89aa2ba4c254d28658b49793425b2 |
|
18-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
| ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 |
|
13-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@138607
/frameworks/base/core/java/android/provider/Contacts.java
|
| c39a6e0c51e182338deb8b63d07933b585134929 |
|
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
/frameworks/base/core/java/android/provider/Contacts.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/provider/Contacts.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/provider/Contacts.java
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/core/java/android/provider/Contacts.java
|
| e570a0fa86c2eea2680f07e2c0c546f104bea948 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
|
| b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/core/java/android/provider/Contacts.java
|
| e1dc1d6dc8064740b78562c3028ccc526a44597e |
|
19-Dec-2008 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake'
Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/java/android/provider/Contacts.java
|
| ae499953ce0e00aae78f374514d4bcc6b99c8354 |
|
02-Nov-2008 |
Evan JIANG <firstfan@gmail.com> |
Fix issue 1164: Incorrect organization type label in contacts
http://code.google.com/p/android/issues/detail?id=1164
The organization definition in string-array resource is different from
android.provider.Contacts.OrganizationColumns
/frameworks/base/core/java/android/provider/Contacts.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/java/android/provider/Contacts.java
|