merge in jb-release history after reset to jb-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 252d39f..7bc0b56 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> ተገኝቷል"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"ከ<xliff:g id="COUNT">%d</xliff:g> የበለጠ ተገኝቷል"</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"እውቅያዎች የሉም"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"1 ተገኝቷል"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ተገኝቷል"</item>
@@ -433,7 +432,7 @@
<string name="contact_status_update_attribution" msgid="752179367353018597">"በ<xliff:g id="SOURCE">%1$s</xliff:g> በኩል"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g>በ<xliff:g id="SOURCE">%2$s</xliff:g> በኩል"</string>
<string name="description_star" msgid="2605854427360036550">"ተወዳጅ"</string>
- <string name="edit_contact" msgid="7529281274005689512">"እውቅያ አርትእ"</string>
+ <string name="edit_contact" msgid="7529281274005689512">"እውቅያ አርትዕ"</string>
<plurals name="merge_info">
<item quantity="one" msgid="148365587896371969">"አልተዋሃደም"</item>
<item quantity="other" msgid="425683718017380845">"ከ<xliff:g id="COUNT">%0$d</xliff:g> ምንጮች የተዋሃደ"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"የድምፅ መልዕክት"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> የድምፅ መልዕክቶች"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"አጫውት"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>፤<xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"ከ<xliff:g id="CALLER">%1$s</xliff:g> አዲስ የድምፅመልዕክት"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"ድምፅ ደብዳቤን ማጫወት አልተቻለም፡፡"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 147e1ed..de92f5f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> contactes"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"Se n\'han trobat més de <xliff:g id="COUNT">%d</xliff:g>."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"No hi ha cap contacte"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"1 contacte"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contactes"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"Missatge de veu"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> missatges de veu"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"Reprodueix"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"Nou missatge de veu de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"No s\'ha pogut reproduir correu de veu."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 096dbb5..9010745 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"Βρέθηκαν <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"Βρέθηκαν περισσότερα από <xliff:g id="COUNT">%d</xliff:g>."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"Δεν υπάρχουν επαφές"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"Βρέθηκε 1"</item>
<item quantity="other" msgid="7988132539476575389">"Βρέθηκαν <xliff:g id="COUNT">%d</xliff:g>"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"Αυτόματος τηλεφωνητής"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> μηνύμ. αυτόμ. τηλεφωνητή"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"Αναπαραγωγή"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"Νέα μην. αυτ. τηλεφ. από <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"Δεν αναπαράχθηκαν τα μην. αυτ. τηλεφ."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b9c3163..a601cda 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> found"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"More than <xliff:g id="COUNT">%d</xliff:g> found."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"No contacts"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"1 found"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> found"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"Voicemail"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> Voicemails"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"Play"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"New voicemail from <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"Couldn\'t play voicemail."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a5c988d..e9d0532 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"Se han encontrado más de <xliff:g id="COUNT">%d</xliff:g> contactos."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"No hay contactos."</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"Mensaje de voz"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes de voz"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"Reproducir"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"Nuevo mensaje de voz de <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"No se ha podido reproducir el mensaje."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 0167abc..b83fd9f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -449,8 +449,8 @@
<string name="toast_making_personal_copy" msgid="288549957278065542">"Membuat salinan pribadi..."</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"Semua kontak"</string>
<string name="list_filter_all_starred" msgid="5031734941601931356">"Yang berkilau bintangnya"</string>
- <string name="list_filter_custom" msgid="8910173055702057002">"Ubahsuaian"</string>
- <string name="list_filter_customize" msgid="4789963356004169321">"Ubahsuaian"</string>
+ <string name="list_filter_custom" msgid="8910173055702057002">"Khusus"</string>
+ <string name="list_filter_customize" msgid="4789963356004169321">"Khusus"</string>
<string name="list_filter_phones" msgid="735313795643493365">"Semua kontak dengan nomor telepon"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Kontak"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Tentukan tampilan ubahsuaian"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 46e97d7..1340f07 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"<xliff:g id="COUNT">%d</xliff:g> נמצאו"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"נמצאו יותר מ-<xliff:g id="COUNT">%d</xliff:g> פריטים."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"אין אנשי קשר"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"נמצא אחד"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> נמצאו"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"דואר קולי"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות קוליות"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"הפעל"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"דואר קולי חדש מאת <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"לא ניתן להפעיל דואר קולי."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d99a5bb..68888d2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"Patikana <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"zaidi ya <xliff:g id="COUNT">%d</xliff:g> zimepatikana."</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"Hakuna anwani"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"Patikana 1"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> zimepatikana"</item>
@@ -504,8 +503,7 @@
<item quantity="one" msgid="1746619685488504230">"Barua ya sauti"</item>
<item quantity="other" msgid="5513481419205061254">"Barua za sauti <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"Cheza"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"Barua mpya ya sauti kutoka <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"Haikuweza kucheza barua ya sauti."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9e3bf64..6f43ac7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -129,8 +129,7 @@
<item quantity="other" msgid="3852668542926965042">"พบ <xliff:g id="COUNT">%d</xliff:g> รายการ"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"พบมากกว่า <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
- <!-- no translation found for listFoundAllContactsZero (922980883593159444) -->
- <skip />
+ <string name="listFoundAllContactsZero" msgid="922980883593159444">"ไม่มีรายชื่อติดต่อ"</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"พบ 1 รายการ"</item>
<item quantity="other" msgid="7988132539476575389">"พบ <xliff:g id="COUNT">%d</xliff:g> รายการ"</item>
@@ -502,8 +501,7 @@
<item quantity="one" msgid="1746619685488504230">"ข้อความเสียง"</item>
<item quantity="other" msgid="5513481419205061254">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความเสียง"</item>
</plurals>
- <!-- no translation found for notification_action_voicemail_play (6113133136977996863) -->
- <skip />
+ <string name="notification_action_voicemail_play" msgid="6113133136977996863">"เล่น"</string>
<string name="notification_voicemail_callers_list" msgid="1153954809339404149">"<xliff:g id="NEWER_CALLERS">%1$s</xliff:g>, <xliff:g id="OLDER_CALLER">%2$s</xliff:g>"</string>
<string name="notification_new_voicemail_ticker" msgid="895342132049452081">"ข้อความเสียงใหม่จาก <xliff:g id="CALLER">%1$s</xliff:g>"</string>
<string name="voicemail_playback_error" msgid="1811242131549854624">"ไม่สามารถเล่นข้อความเสียง"</string>
diff --git a/src/com/android/contacts/detail/ContactLoaderFragment.java b/src/com/android/contacts/detail/ContactLoaderFragment.java
index 242b12b..c56f659 100644
--- a/src/com/android/contacts/detail/ContactLoaderFragment.java
+++ b/src/com/android/contacts/detail/ContactLoaderFragment.java
@@ -284,7 +284,8 @@
}
public boolean isContactCanCreateShortcut() {
- return mContactData != null && !mContactData.isUserProfile();
+ return mContactData != null && !mContactData.isUserProfile()
+ && !mContactData.isDirectoryEntry();
}
@Override
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 962a46b..7159fe5 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1644,7 +1644,7 @@
final ValuesDelta values = entity.getValues();
if (values.isVisible()) {
final ValuesDelta primary = entity.getPrimaryEntry(Photo.CONTENT_ITEM_TYPE);
- if (primary.getAsByteArray(Photo.PHOTO) != null) {
+ if (primary != null && primary.getAsByteArray(Photo.PHOTO) != null) {
countWithPicture++;
} else {
final long rawContactId = values.getAsLong(RawContacts._ID);
diff --git a/src/com/android/contacts/editor/EditorAnimator.java b/src/com/android/contacts/editor/EditorAnimator.java
index 33ee5b8..a16b425 100644
--- a/src/com/android/contacts/editor/EditorAnimator.java
+++ b/src/com/android/contacts/editor/EditorAnimator.java
@@ -201,12 +201,16 @@
/**
* Traverses up the view hierarchy and returns all views below this item. Stops
* once a parent is not a vertical LinearLayout
+ *
+ * @return List of views that are below the given view. Empty list if parent of view is null.
*/
private static List<View> getViewsBelowOf(View view) {
final ViewGroup victimParent = (ViewGroup) view.getParent();
final List<View> result = Lists.newArrayList();
- final int index = victimParent.indexOfChild(view);
- getViewsBelowOfRecursive(result, victimParent, index + 1);
+ if (victimParent != null) {
+ final int index = victimParent.indexOfChild(view);
+ getViewsBelowOfRecursive(result, victimParent, index + 1);
+ }
return result;
}