From 8acbcb9f575cd918ab58c764b200f28d7829714e Mon Sep 17 00:00:00 2001 From: blong Date: Wed, 3 Aug 2016 14:25:27 +0800 Subject: Correct the appropriate size when add groups - Correct the right size when add/move contacts in group for more better user experience and avoid FC CRs-Fixed: 1036875 Change-Id: I7887ef251aa7fdfac5250fe89905a4031b81d693 --- .../activities/MultiPickContactsActivity.java | 35 +++++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/com/android/contacts/activities/MultiPickContactsActivity.java b/src/com/android/contacts/activities/MultiPickContactsActivity.java index 708ab0f59..f18f55f50 100755 --- a/src/com/android/contacts/activities/MultiPickContactsActivity.java +++ b/src/com/android/contacts/activities/MultiPickContactsActivity.java @@ -214,7 +214,9 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP private static final int SIM_COLUMN_ID = 4; // reduce the value to avoid too large transaction. - private int MAX_CONTACTS_NUM_TO_SELECT_ONCE = 500; + private int MAX_CONTACTS_NUM_TO_SELECT_ONCE = 1000; + + private int MAX_CONTACTS_NUM_TO_GROUP = 100; private static final int BUFFER_LENGTH = 400; @@ -1115,25 +1117,43 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP } if (mPickMode.isPickContact()) { if (SimContactsConstants.ACTION_MULTI_PICK.equals(getIntent().getAction())) { - if (mChoiceSet.size() > MAX_CONTACTS_NUM_TO_SELECT_ONCE) { - Toast.makeText(mContext, - mContext.getString(R.string.too_many_contacts_add_to_group, - MAX_CONTACTS_NUM_TO_SELECT_ONCE), - Toast.LENGTH_SHORT).show(); - } else { switch (getIntent().getIntExtra(ADD_MOVE_GROUP_MEMBER_KEY, ACTION_DEFAULT_VALUE)) { case ACTION_ADD_GROUP_MEMBER: + if (mChoiceSet.size() > MAX_CONTACTS_NUM_TO_GROUP) { + Toast.makeText(mContext, + mContext.getString( + R.string.too_many_contacts_add_to_group, + MAX_CONTACTS_NUM_TO_GROUP), + Toast.LENGTH_SHORT).show(); + return; + } this.setResult(RESULT_OK, new Intent().putExtras(mChoiceSet)); finish(); break; case ACTION_MOVE_GROUP_MEMBER: + if (mChoiceSet.size() > MAX_CONTACTS_NUM_TO_GROUP) { + Toast.makeText(mContext, + mContext.getString( + R.string.too_many_contacts_add_to_group, + MAX_CONTACTS_NUM_TO_GROUP), + Toast.LENGTH_SHORT).show(); + return; + } showGroupSelectionList( getIntent().getStringExtra( SimContactsConstants.ACCOUNT_TYPE), getIntent().getLongExtra(KEY_GROUP_ID, -1)); break; default: + if (mChoiceSet.size() > MAX_CONTACTS_NUM_TO_SELECT_ONCE) { + Toast.makeText(mContext, + mContext.getString( + R.string.too_many_contacts_add_to_group, + MAX_CONTACTS_NUM_TO_SELECT_ONCE), + Toast.LENGTH_SHORT).show(); + return; + } Intent intent = new Intent(); Bundle bundle = new Bundle(); bundle.putBundle(SimContactsConstants.RESULT_KEY, mChoiceSet); @@ -1141,7 +1161,6 @@ public class MultiPickContactsActivity extends Activity implements ViewPager.OnP this.setResult(RESULT_OK, intent); finish(); } - } } else if (mChoiceSet.size() > 0) { showDialog(R.id.dialog_delete_contact_confirmation); } -- cgit v1.2.3