Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e339bd23 authored by xmao's avatar xmao
Browse files

Contacts: Modify review comments in Contacts 

  Some modifications are cherry-pick from git hub
  we can not modify it,so modify the review comments
  in this commit.remove extra spaces and adjust indentation
  CRs-Fixed:770912

Change-Id: I1e14f1677b94277311464deeb113fc0489f55095
parent dc1bf626

res/menu/quickcontact.xml

+5 −1
Original line number Diff line number Diff line
@@ -77,4 +77,8 @@ 
        android:title="@string/menu_plugin_center"

        android:alphabeticShortcut="p" />



    <item

        android:id="@+id/menu_online_business_hall"

        android:title="@string/menu_online_business_hall" />



</menu>

res/values-zh-rCN/rcs_string.xml

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
    <string name="upload_photo_profile_failed">上传头像失败！</string>

    <!-- Menu item used to backup or restore the local profile -->

    <string name="menu_local_profile_upload_download">上传/获取</string>

    <string name="menu_online_business_hall">网上营业厅</string>

    <string name="menu_contacts_photo_update">联系人头像更新</string>

    <string name="profile_test_account">13522631112</string>

    <string name="rcs_service_is_not_available">融合通信服务器不可用</string>

res/values/rcs_string.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    <string name="upload_photo_profile_failed">Upload photo profile failed!</string>

    <!-- Menu item used to backup or restore the local profile -->

    <string name="menu_local_profile_upload_download">Upload/Download</string>

    <string name="menu_online_business_hall">Online Business Hall</string>



    <string name="menu_contacts_photo_update">Contacts photo update</string>

src/com/android/contacts/ContactSaveService.java

+2 −1
Original line number Diff line number Diff line
@@ -523,7 +523,8 @@ public class ContactSaveService extends IntentService { 
                                String.valueOf(rawContactId)

                            });

                    }

                RCSUtil.newAndEditContactsUpdateEnhanceScreen(resolver,rawContactId);

                RCSUtil.newAndEditContactsUpdateEnhanceScreen(getApplicationContext(),

                        resolver, rawContactId);

                // We can change this back to false later, if we fail to save the contact photo.

                succeeded = true;

                break;

src/com/android/contacts/activities/PeopleActivity.java

+1 −17
Original line number Diff line number Diff line
@@ -1495,23 +1495,7 @@ public class PeopleActivity extends ContactsActivity implements 
            }

            case START_CAPTURE:

                if (resultCode == RESULT_OK) {

                    Bundle bundle = data.getExtras();

                    String name = data.getStringExtra("name");

                    String tel = data.getStringExtra("tel");

                    String companyTel = data.getStringExtra("companyTel");

                    String companyFax = data.getStringExtra("companyFax");

                    String companyName = data.getStringExtra("companyName");

                    String companyDuty = data.getStringExtra("companyDuty");

                    String companyEmail = data.getStringExtra("companyEmail");

                    Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);

                    intent.setType(Contacts.CONTENT_ITEM_TYPE);

                    intent.putExtra(ContactsContract.Intents.Insert.NAME, name);

                    intent.putExtra(ContactsContract.Intents.Insert.PHONE, tel);

                    intent.putExtra(ContactsContract.Intents.Insert.PHONE_TYPE,

                            ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);

                    intent.putExtra(ContactsContract.Intents.Insert.EMAIL, companyEmail);

                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);

                    this.startActivity(intent);

                    RCSUtil.insertQrcodeContact(this,data);

                }

                break;

            case SUBACTIVITY_NEW_GROUP: