| b7eecdd9a1276b721bb9644a0762dfd969e52709 |
|
07-Nov-2016 |
Walter Jang <wjang@google.com> |
resolve merge conflicts of 9f523b4 to nyc-dev
Bug: 32219099
Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd
Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74
|
| 4718349e14c08e21f78e48e306a99d1b0fb5cd2e |
|
04-Nov-2016 |
Walter Jang <wjang@google.com> |
resolve merge conflicts of e20a370 to mnc-dev
Test: same test cases as I0310c6e35cb378e1fe22691e5aecdb8ece1a3c9e.
except ran them on Nexus 5 MOB3OH this time
Bug: 32219099
Change-Id: I6679d55fb0cb7618fd0557375e587375c940eaf0
|
| b49ff73fbeb64a5aeffbe26bbdd015031e288c79 |
|
04-Nov-2016 |
Walter Jang <wjang@google.com> |
resolve merge conflicts of be90a70 to lmp-mr1-dev
Test: same test cases as Ia57ae539112e752fe4fd1f01407b7905f1bc02fa
except ran them on Nexus 5 LMY49R this time
Bug: 32219099
Change-Id: I981d449d453a54213bd60ed789ae328bfb0c05a5
|
| 0b6c338eb238a4ca061372874e5213205d5ea1b1 |
|
26-Oct-2016 |
Walter Jang <wjang@google.com> |
Ask for confirmation before importing from vcard
But only when vcard import is started from outside
the contacts application itself.
Test: Manually confirmed the following behavior
1. When there is 0 or 1 writable contacts providing
account on the device:
- Importing contacts from the contacts app itself
DOES NOT SHOW the new confirmation dialog.
- Sending a vcard to contacts from another application
DOES SHOW the new confirmation dialog.
2. When there are 2 or more writable contacts providing
accounts on the device:
- Importing contacts from the contacts app itself
DOES NOT SHOW the new confirmation dialog, instead the
existing account picker dialog is displayed.
- Sending a vcard to contacts from another application
DOES NOT SHOW the new confirmation dialog, instead the
existing account picker dialog is displayed.
Bug: 32219099
Change-Id: Ia57ae539112e752fe4fd1f01407b7905f1bc02fa
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| b1361f9f379001fd27511c80655c52dd70a15122 |
|
21-Feb-2016 |
Sailesh Nepal <sail@google.com> |
Add gradle build file for ContactsCommon
Note, because the code now builds as a library project, resource IDs
are no longer final. This means that they can't be used inside switch
statements. Fix was to change everything to if statements.
Bug: 26676586
Change-Id: Ia4bee80783ab6b6f34c9b19e78f3b475dbea00b0
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| d80e3bbb55a9cc093affc15b1d4ff5e7262fa4ad |
|
04-Nov-2015 |
Wenyi Wang <wenyiw@google.com> |
Change title string of account selection dialog when importing contacts
In addition to the string change, this CL also fixed a TODO in
one of the two dialogs using the string.
Bug: 25476465
Change-Id: I8ad2a00446ae776c7e97b38462edfac7d4728401
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| ed2a24cb0a9f207e4f1211cfff51bd8e6bcfad90 |
|
14-Jul-2015 |
Walter Jang <wjang@google.com> |
Allow the user to select the vcards to import
Rather than always scanning for .vcf files in external storage
This is the flip-side to b/22453182 where we changed to allow
the user to select the destination for vcard export so that
we could remove the WRITE_EXTERNAL_STORAGE permission.
Additionally, we change the import/export options in the
dialog to read "Export to .vcf file" and "Import from .vcf file"
since the previous text (Just "Export" and "Import from external
storage" are not accurate.
Note, we continue to support importing from multiple .vcf files
at once but we no longer need our own dialog to present those
options to the user.
Bug 22454038
Change-Id: I1a145f00f07c4c0f547c38d720c109197baab833
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 6084957f19cf42bc7ccbbefaabfd0f96ef376587 |
|
26-Feb-2015 |
Brian Attwell <brianattwell@google.com> |
Don't use ImplicitIntentUtils for explicit intent
Bug: 19524362
Change-Id: Ief17e212e8e92ac500d3af5fe7f17adbfc2e6dd5
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 5a8dc08da63762d69b71938b45ccb96ad4076a00 |
|
20-Feb-2015 |
Brian Attwell <brianattwell@google.com> |
Avoid senseless disambiguation #1/2
This makes having two contacts apps on the same
device tolerable.
Bug: 18777272
Change-Id: Ib75eadfb94eee2c5c8305747eddd01ba9a8b1dc4
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 90b8b6dfa7ee6ab6f2e473ea3cfa7d80e526bf9a |
|
03-Feb-2015 |
Brian Attwell <brianattwell@google.com> |
Don't use hidden INVALID_SUBSCRIPTION_ID
Alternatively, I could unhide INVALID_SUBSCRIPTION_ID.
However, the affected code doesn't actually need to know
the value of SubscriptionManager#INVALID_SUBSCRIPTION_ID.
ContactsCommon simply uses INVALID_SUB_ID when the value
for subscription ID doesn't matter, because we know
the mSubscriptionId value won't be read later.
Bug: 18777272
Change-Id: I473ef361ae6cfa3a1484c38ca3aed88cc0b5d6d1
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 2f3fd5f7b5ee3ef74362509ef596063cea122f89 |
|
25-Nov-2014 |
Jay Shrauner <shrauner@google.com> |
Fix int/long mismatch for import from SIM
Make subscription id an int everywhere.
Bug:18524128
Change-Id: I33e443603acb4fbf6d67697b289d99b57ff0bbcd
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| ff95fe1ca9cc570acc41c9335a6cdeecfd851e44 |
|
22-Nov-2014 |
Wink Saville <wink@google.com> |
Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 426b4719d8c1d42990225fc49c3851112471f098 |
|
20-Nov-2014 |
Wink Saville <wink@google.com> |
Revert "Additional changes to SubscriptionManager API as per API council."
This reverts commit a63ae799821744f941a1f2d43850372199e075e8.
Change-Id: I30d9b82aeaff5595fe952313b5728fb9f6c2c076
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| a63ae799821744f941a1f2d43850372199e075e8 |
|
16-Nov-2014 |
Wink Saville <wink@google.com> |
Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| d09e43ca0bd57c25cbd4e4a87bff0b9fc10a1459 |
|
23-Oct-2014 |
Wink Saville <wink@google.com> |
Change subId to int from long
Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 9524fd1d86a83d323b2c5fc7a57667906ced827c |
|
06-Oct-2014 |
Brian Attwell <brianattwell@google.com> |
Allow importing contacts from mulitple sims
There are multiple options we may need to display under Import/Export
for SIM cards
1. If only one sim card, display "Import from SIM" option
2. If multiple SIMs, display "Import from SIM, <name> - <phone-number>
for each sim subscription.
3. If a sim subscription doesn't have a known phone number, display
"Import from SIM, <name>" for the sim subscription.
Bug: 16525652
Change-Id: I73b3c45be116c75d597727f4b31ccf2d0e61c623
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|
| 7903d2473e1120e32fa5380a7d7532d0a21e2180 |
|
04-Dec-2012 |
Chiao Cheng <chiaocheng@google.com> |
Moving vcard UI to ContactsCommon.
Moving all class in vcard directory in preparation to move
ImportExportDialogFragment.
Bug: 6993891
Change-Id: I4391c6e63d20ebe91e240001885a6ce18388e51f
/packages/apps/ContactsCommon/src/com/android/contacts/common/util/AccountSelectionUtil.java
|