summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dongzhuo Zhang <dongzhuozhang@google.com> 2024-10-23 19:51:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-23 19:51:33 +0000
commit388ef45bf14c50e51c59c39e92df100d3ed3e93c (patch)
tree2b2e5c8225032a349e65fcc73e532ebf680edabc
parenta51eb6c7228143c3526807d8c40ca637249d1f15 (diff)
parent256735f80bd54760fced44a10c924bef7fd3bf79 (diff)
Merge "Declare move contacts to default account intent in ContactsContract." into main
-rw-r--r--core/api/current.txt1
-rw-r--r--core/java/android/provider/ContactsContract.java8
2 files changed, 9 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 73b35b211f25..bb60e029f6d3 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -37075,6 +37075,7 @@ package android.provider {
@FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount {
method @FlaggedApi("android.provider.new_default_account_api_enabled") @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState getDefaultAccountForNewContacts(@NonNull android.content.ContentResolver);
+ field public static final String ACTION_MOVE_CONTACTS_TO_DEFAULT_ACCOUNT = "android.provider.action.MOVE_CONTACTS_TO_DEFAULT_ACCOUNT";
}
@FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState {
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 5ecf361e83c7..8afc1779ed00 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -3071,6 +3071,14 @@ public final class ContactsContract {
"queryDefaultAccountForNewContacts";
/**
+ * Action used to launch the UI to move contacts to the default account.
+ */
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_MOVE_CONTACTS_TO_DEFAULT_ACCOUNT =
+ "android.provider.action.MOVE_CONTACTS_TO_DEFAULT_ACCOUNT";
+
+
+ /**
* Represents the state of the default account, and the actual {@link Account} if it's
* a cloud account.
* If the default account is set to {@link #DEFAULT_ACCOUNT_STATE_LOCAL} or