Merge "New design for photo editor" into lmp-mr1-dev
diff --git a/res/layout/edit_delete_button.xml b/res/layout/edit_delete_button.xml
index eff2c51..d2c7fb9 100644
--- a/res/layout/edit_delete_button.xml
+++ b/res/layout/edit_delete_button.xml
@@ -21,8 +21,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="@dimen/editor_min_line_item_height"
- android:layout_marginRight="2dip"
- android:layout_marginEnd="2dip"
android:layout_gravity="center_vertical">
<ImageView
android:id="@+id/delete_button"
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1da4dcc..f0aa861 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -91,7 +91,7 @@
<string name="addPeopleToGroup" msgid="7879585947222263516">"برای افزودن چند عضو، گروه را ویرایش کنید."</string>
<string name="savingContact" msgid="4075751076741924939">"در حال ذخیره مخاطب..."</string>
<string name="contactSavedToast" msgid="7152589189385441091">"مخاطب ذخیره شد."</string>
- <string name="contactSavedErrorToast" msgid="3207250533172944892">"تغییرات مخاطب ذخیره نمیشود."</string>
+ <string name="contactSavedErrorToast" msgid="3207250533172944892">"ذخیره تغییرات مخاطب انجام نشد."</string>
<string name="groupSavedToast" msgid="1168756874239833756">"گروه ذخیره شد."</string>
<string name="groupSavedErrorToast" msgid="7984466936615304740">"ذخیرهٔ تغییرات گروه انجام نشد."</string>
<plurals name="listTotalPhoneContacts">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a662652..50dfe29 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -249,12 +249,10 @@
<string name="header_event_entry" msgid="6738250422744401460">"Evento"</string>
<string name="header_relation_entry" msgid="1520292958088146460">"Relação"</string>
<string name="content_description_directions" msgid="2686791825798189335">"rotas até o local"</string>
- <!-- no translation found for content_description_recent_sms (1666389577263317445) -->
- <skip />
+ <string name="content_description_recent_sms" msgid="1666389577263317445">"sms recente. <xliff:g id="MESSAGE_BODY">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para responder"</string>
<string name="content_description_recent_call_type_incoming" msgid="5210739096863511410">"entrada"</string>
<string name="content_description_recent_call_type_outgoing" msgid="5156553338985232744">"saída"</string>
<string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
- <!-- no translation found for content_description_recent_call (5183800406316723676) -->
- <skip />
+ <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para retornar a chamada"</string>
<string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
</resources>
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bb03705..aed0f34 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -515,7 +515,8 @@
final ArrayList<ContentProviderOperation> diff,
final ContentProviderResult[] results) {
final int diffSize = diff.size();
- for (int i = 0; i < diffSize; i++) {
+ final int numResults = results.length;
+ for (int i = 0; i < diffSize && i < numResults; i++) {
ContentProviderOperation operation = diff.get(i);
if (operation.getType() == ContentProviderOperation.TYPE_INSERT
&& operation.getUri().getEncodedPath().contains(