merge in nakasi-factoryrom-release history after reset to jb-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ea59a3d..a293166 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 gevind"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gevind"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alle"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Groepe"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Gunstelinge"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Foon"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f18baed..3b0c8b9 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 ተገኝቷል"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ተገኝቷል"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"ሁሉም"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"ቡድኖች"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"ተወዳጆች"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"ስልክ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ac26be7..5f991c2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"تم العثور على جهة اتصال واحدة"</item>
<item quantity="other" msgid="7988132539476575389">"تم العثور على <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"الكل"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"المجموعات"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"المفضلة"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"الهاتف"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 435f47c..7b191c3 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"знойдзены 1"</item>
<item quantity="other" msgid="7988132539476575389">"Знойдзеныя: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Усе"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Групы"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Выбранае"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Тэлефон"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0ce7374..32989b5 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 намерен"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> намерени"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Всички"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Групи"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Любими"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Телефон"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ec06dbf..5cf8209 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 contacte"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contactes"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tots"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grups"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Preferits"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telèfon"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1e1bf59..9744658 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"Nalezeno: 1"</item>
<item quantity="other" msgid="7988132539476575389">"Nalezeno: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Vše"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Všechny kontakty"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupiny"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Oblíbené"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 51f01ce..ed82fbc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"1 fundet"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> fundet"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alle"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Alle kontaktpersoner"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favorit"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1ee13e9..2626b5f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 gefunden"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gefunden"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alle"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruppen"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriten"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6eb32a2..8198a22 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Βρέθηκε 1"</item>
<item quantity="other" msgid="7988132539476575389">"Βρέθηκαν <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Όλα"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Ομάδες"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Αγαπ."</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Τηλέφωνο"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c1cae5f..37b6679 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"1 found"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> found"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"All"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"All contacts"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Groups"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favourites"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Phone"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 07afea7..9d0f8f0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"Se encontró uno (1)"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrado(s)"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Todos"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Todos los contactos"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Teléfono"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b3503b5..a4bc8c6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Todos"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Todos los contactos"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Teléfono"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0dfc7d6..2e314ad 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 leitud"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> leitud"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Kõik"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupid"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Lemmikud"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f83fc5f..9c286e9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 مورد پیدا شد"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> یافت شد"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"همه"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"گروه ها"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"موارد دلخواه"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"تلفن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1349934..4c7d521 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Löytyi 1"</item>
<item quantity="other" msgid="7988132539476575389">"Löytyi <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Kaikki"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Ryhmät"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Suosikit"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Puhelin"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 805288a..6a195cf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"1 contact trouvé"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> contact(s) trouvé(s)"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tous"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Tous les contacts"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Groupes"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoris"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Tél."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4909eea..3b62a4c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 मिला"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> मिले"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"सभी"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"समूह"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"पसंदीदा"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"फ़ोन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 83e62c7..f025722 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 pronađen"</item>
<item quantity="other" msgid="7988132539476575389">"Pronađeno kontakata: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Sve"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupe"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriti"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index d1a6792..acc3dd8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"1 találat"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> találat"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Összes"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Az összes névjegy"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Csoportok"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Kedvencek"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 6d47924..7b59b58 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Ada 1"</item>
<item quantity="other" msgid="7988132539476575389">"Ada <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Semua"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grup"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favorit"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telepon"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a974042..7288c6e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 trovato"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> trovati"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tutti"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruppi"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Preferiti"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefono"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 36e4b20..e888650 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"נמצא אחד"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> נמצאו"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"הכל"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"כל אנשי הקשר"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"קבוצות"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"מועדפים"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"טלפון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 43f97e6..deea7a7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1件見つかりました"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g>件見つかりました"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"すべて"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"グループ"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"お気入り"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"電話"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3ad8c25..84d75aa 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1개를 찾았습니다."</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g>개를 찾았습니다."</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"전체"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"그룹"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"즐겨찾기"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"휴대전화"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 3d8fa17..bbc764c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"rastas 1"</item>
<item quantity="other" msgid="7988132539476575389">"Rasta <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Visi"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupės"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Adresynas"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefonas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f6b77b1..583be43 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Atrasta 1"</item>
<item quantity="other" msgid="7988132539476575389">"Atrastas <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Visas"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupas"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Izlase"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Zvanīt"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index a24b5cf..c067af5 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 ditemui"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ditemui"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Semua"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Kumpulan"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Kegemaran"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2496659..863b52a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 funnet"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> funnet"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alle"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritter"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 86d19fb..e3c0567 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 gevonden"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> gevonden"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alle"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Groepen"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriet"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefoon"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a411d96..ee810db 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Znaleziono: 1"</item>
<item quantity="other" msgid="7988132539476575389">"Znaleziono: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Wszystkie"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupy"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Ulubione"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ffc9ea6..6451202 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 encontrado"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrado(s)"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tudo"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefone"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index acfedef..3be405a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"Um encontrado"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> encontrados"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tudo"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Todos os contatos"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupos"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoritos"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefone"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 636bb43..0dbb54f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -178,7 +178,7 @@
<item quantity="one" msgid="4826918429708286628">"chattà 1"</item>
<item quantity="other" msgid="7988132539476575389">"Chattà <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <!-- no translation found for contactsAllLabel (6178225597569649305) -->
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
<skip />
<!-- no translation found for contactsGroupsLabel (2841971472518003524) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 36774a9..3607647 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"A fost găsită 1 persoană din agendă"</item>
<item quantity="other" msgid="7988132539476575389">"Au fost găsite <xliff:g id="COUNT">%d</xliff:g> (de) persoane din agendă"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Toate"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupuri"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favorite"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9dd0e0e..776659e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Найдено: 1"</item>
<item quantity="other" msgid="7988132539476575389">"Найдено: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Все"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Группы"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Избранное"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Кнопки"</string>
@@ -410,7 +411,7 @@
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Сначала имя"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Сначала фамилию"</string>
<string name="take_photo" msgid="7496128293167402354">"Сфотографировать"</string>
- <string name="take_new_photo" msgid="7341354729436576304">"Создать новое фото"</string>
+ <string name="take_new_photo" msgid="7341354729436576304">"Сфотографировать"</string>
<string name="pick_photo" msgid="3746334626214970837">"Выбрать фото из галереи"</string>
<string name="pick_new_photo" msgid="7962368009197147617">"Выбрать новое фото из Галереи"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"Список контактов обновляется после смены языка интерфейса."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 72735c8..8fb0859 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Počet nájdených položiek: 1"</item>
<item quantity="other" msgid="7988132539476575389">"Počet nájdených položiek: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Všetky"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupiny"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Obľúbené"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefón"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3c2d7c8..1cc4b94 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 najden"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> najdenih"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Vse"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Skupine"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Priljubljeno"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index ef6d21a..8f30646 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 пронађен"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> пронађено"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Све"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Групе"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Омиљено"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Телефон"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 54179e1..ee4f9ea 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 hittades"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> hittades"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Alla"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Grupper"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Favoriter"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a146176..68f65a4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="4826918429708286628">"Patikana 1"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> zimepatikana"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Zote"</string>
+ <string name="contactsAllLabel" msgid="6479708629170672169">"Anwani zote"</string>
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Vikundi"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Vipendwa"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Simu"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2e7e052..d7f78f7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"พบ 1 รายการ"</item>
<item quantity="other" msgid="7988132539476575389">"พบ <xliff:g id="COUNT">%d</xliff:g> รายการ"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"ทั้งหมด"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"กลุ่ม"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"รายการโปรด"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"โทรศัพท์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 07643af..1f4366d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 ang nakita"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> ang nakita"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Lahat"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Mga Pangkat"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Mga Paborito"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telepono"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 82ef250..c8d4cc3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"1 kişi bulundu"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> kişi bulundu"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tümü"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Gruplar"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Sık Kullanılanlar"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Telefon"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 33ac75e..6c17ce5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Знайдено 1"</item>
<item quantity="other" msgid="7988132539476575389">"Знайдено <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Усі"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Групи"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Вибране"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Тел."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f825411..4a8f0c7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"Đã tìm thấy 1"</item>
<item quantity="other" msgid="7988132539476575389">"Đã tìm thấy <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Tất cả"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Nhóm"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Mục ưa thích"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Điện thoại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d069f9c..0474e23 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"找到 1 个联系人"</item>
<item quantity="other" msgid="7988132539476575389">"找到 <xliff:g id="COUNT">%d</xliff:g> 个联系人"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"全部"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"群组"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"收藏"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"拨号"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e7ce3d7..01aaa34 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"找到 1 位聯絡人"</item>
<item quantity="other" msgid="7988132539476575389">"找到 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"全部"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"群組"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"我的最愛"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"電話"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d997f59..898d7e1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -134,7 +134,8 @@
<item quantity="one" msgid="4826918429708286628">"otholakele ongu-1"</item>
<item quantity="other" msgid="7988132539476575389">"<xliff:g id="COUNT">%d</xliff:g> tholakele"</item>
</plurals>
- <string name="contactsAllLabel" msgid="6178225597569649305">"Konke"</string>
+ <!-- no translation found for contactsAllLabel (6479708629170672169) -->
+ <skip />
<string name="contactsGroupsLabel" msgid="2841971472518003524">"Amaqembu"</string>
<string name="contactsFavoritesLabel" msgid="8417039765586853670">"Izintandokazi"</string>
<string name="dialerIconLabel" msgid="6500826552823403796">"Ifoni"</string>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index bcceff4..0502d4d 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -560,6 +560,11 @@
case ContactsRequest.ACTION_VIEW_CONTACT:
// We redirect this intent to the detail activity on 1-pane, so we don't get
// here. It's only for 2-pane.
+ Uri currentlyLoadedContactUri = mContactDetailFragment.getUri();
+ if (currentlyLoadedContactUri != null
+ && !mRequest.getContactUri().equals(currentlyLoadedContactUri)) {
+ mContactDetailsView.setMaskVisibility(true);
+ }
tabToOpen = TabState.ALL;
break;
case ContactsRequest.ACTION_GROUP:
@@ -612,7 +617,7 @@
// If we are switching from one group to another, do a cross-fade
if (mGroupDetailFragment != null && mGroupDetailFragment.getGroupUri() != null &&
!UriUtils.areEqual(mGroupDetailFragment.getGroupUri(), groupUri)) {
- mGroupDetailsView.startTransition(mGroupDetailFragment.getView(), false);
+ mGroupDetailsView.startMaskTransition(false);
}
mGroupDetailFragment.loadGroup(groupUri);
invalidateOptionsMenuIfNeeded();
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index c91f493..5c68dcb 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -356,6 +356,9 @@
mShowStaticPhoto = showPhoto;
}
+ /**
+ * Shows the contact detail with a message indicating there are no contact details.
+ */
public void showEmptyState() {
setData(null, null);
}
@@ -406,6 +409,9 @@
if (mContactData == null) {
mView.setVisibility(View.INVISIBLE);
+ if (mStaticPhotoContainer != null) {
+ mStaticPhotoContainer.setVisibility(View.GONE);
+ }
mAllEntries.clear();
if (mAdapter != null) {
mAdapter.notifyDataSetChanged();
diff --git a/src/com/android/contacts/detail/ContactDetailFragmentCarousel.java b/src/com/android/contacts/detail/ContactDetailFragmentCarousel.java
index 7af9b28..08ed87b 100644
--- a/src/com/android/contacts/detail/ContactDetailFragmentCarousel.java
+++ b/src/com/android/contacts/detail/ContactDetailFragmentCarousel.java
@@ -173,6 +173,16 @@
}
}
+ /**
+ * Reset the fragment carousel to show the about page.
+ */
+ public void reset() {
+ if (mCurrentPage != ABOUT_PAGE) {
+ mCurrentPage = ABOUT_PAGE;
+ snapToEdge();
+ }
+ }
+
public int getCurrentPage() {
return mCurrentPage;
}
diff --git a/src/com/android/contacts/detail/ContactDetailLayoutController.java b/src/com/android/contacts/detail/ContactDetailLayoutController.java
index a99f35f..2c18d4f 100644
--- a/src/com/android/contacts/detail/ContactDetailLayoutController.java
+++ b/src/com/android/contacts/detail/ContactDetailLayoutController.java
@@ -291,8 +291,7 @@
if (PhoneCapabilityTester.isUsingTwoPanes(mActivity)) {
// Tablet: If we already showed data before, we want to cross-fade from screen to screen
if (contactWasLoaded && mTransitionAnimationView != null && isDifferentContact) {
- mTransitionAnimationView.startTransition(
- mViewContainer, mContactData == null);
+ mTransitionAnimationView.startMaskTransition(mContactData == null);
}
} else {
// Small screen: We are on our own screen. Fade the data in, but only the first time
@@ -367,7 +366,7 @@
// This is screen is very hard to animate properly, because there is such a hard
// cut from the regular version. A proper animation would have to reflow text
// and move things around. Doing a simple cross-fade instead.
- mTransitionAnimationView.startTransition(mViewContainer, false);
+ mTransitionAnimationView.startMaskTransition(false);
}
// Set the contact data (hide the static photo because the photo will already be in
@@ -406,6 +405,9 @@
case LayoutMode.TWO_COLUMN_FRAGMENT_CAROUSEL: {
// Allow swiping between all fragments
mFragmentCarousel.enableSwipe(true);
+ if (isDifferentContact) {
+ mFragmentCarousel.reset();
+ }
if (!isDifferentContact && animateStateChange) {
mFragmentCarousel.animateAppear();
}
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index eb5fb23..3c91716 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -197,7 +197,7 @@
Uri lookupUri = intent.getData();
// Check to see whether it comes from the old version.
- if (LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {
+ if (lookupUri != null && LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {
final long rawContactId = ContentUris.parseId(lookupUri);
lookupUri = RawContacts.getContactLookupUri(getContentResolver(),
ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId));
@@ -207,8 +207,9 @@
// Read requested parameters for displaying
final Rect sourceBounds = intent.getSourceBounds();
- Preconditions.checkNotNull(sourceBounds, "missing sourceBounds");
- mFloatingLayout.setChildTargetScreen(sourceBounds);
+ if (sourceBounds != null) {
+ mFloatingLayout.setChildTargetScreen(sourceBounds);
+ }
mExcludeMimes = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);
diff --git a/src/com/android/contacts/util/ImageViewDrawableSetter.java b/src/com/android/contacts/util/ImageViewDrawableSetter.java
index 5cde022..1d23dd0 100644
--- a/src/com/android/contacts/util/ImageViewDrawableSetter.java
+++ b/src/com/android/contacts/util/ImageViewDrawableSetter.java
@@ -39,10 +39,10 @@
private ImageView mTarget;
private byte[] mCompressed;
private Drawable mPreviousDrawable;
+ private int mDurationInMillis = 0;
private static final String TAG = "ImageViewDrawableSetter";
public ImageViewDrawableSetter() {
-
}
public ImageViewDrawableSetter(ImageView target) {
@@ -54,6 +54,10 @@
setCompressedImage(contactData.getPhotoBinaryData());
}
+ public void setTransitionDuration(int durationInMillis) {
+ mDurationInMillis = durationInMillis;
+ }
+
public ImageView getTarget() {
return mTarget;
}
@@ -97,7 +101,7 @@
// If we don't have a new Drawable, something went wrong... bail out.
if (newDrawable == null) return previousBitmap();
- if (mPreviousDrawable == null) {
+ if (mPreviousDrawable == null || mDurationInMillis == 0) {
// Set the new one immediately.
mTarget.setImageDrawable(newDrawable);
} else {
@@ -107,7 +111,7 @@
beforeAndAfter[1] = newDrawable;
final TransitionDrawable transition = new TransitionDrawable(beforeAndAfter);
mTarget.setImageDrawable(transition);
- transition.startTransition(200);
+ transition.startTransition(mDurationInMillis);
}
// Remember this for next time, so that we can transition from it to the
diff --git a/src/com/android/contacts/widget/TransitionAnimationView.java b/src/com/android/contacts/widget/TransitionAnimationView.java
index cefc82d..28d728b 100644
--- a/src/com/android/contacts/widget/TransitionAnimationView.java
+++ b/src/com/android/contacts/widget/TransitionAnimationView.java
@@ -15,30 +15,20 @@
*/
package com.android.contacts.widget;
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
import android.animation.ObjectAnimator;
import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
/**
- * A container for a view that needs to have exit/enter animations when rebinding data.
- * After rebinding the contents, the following call should be made (where child is the only visible)
- * child
- * <pre>
- * TransitionAnimationView.startAnimation(child);
- * </pre>
+ * A container that places a masking view on top of all other views. The masking view can be
+ * faded in and out. Currently, the masking view is solid color white.
*/
-public class TransitionAnimationView extends FrameLayout implements AnimatorListener {
- private View mPreviousStateView;
- private Bitmap mPreviousStateBitmap;
- private ObjectAnimator mPreviousAnimator;
+public class TransitionAnimationView extends FrameLayout {
+ private View mMaskingView;
+ private ObjectAnimator mAnimator;
public TransitionAnimationView(Context context) {
this(context, null, 0);
@@ -55,75 +45,43 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- mPreviousStateView = new View(getContext());
- mPreviousStateView.setVisibility(View.INVISIBLE);
- mPreviousStateView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
+ mMaskingView = new View(getContext());
+ mMaskingView.setVisibility(View.INVISIBLE);
+ mMaskingView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT));
- addView(mPreviousStateView);
+ mMaskingView.setBackgroundColor(Color.WHITE);
+ addView(mMaskingView);
}
- @Override
- protected void onDetachedFromWindow() {
- super.onDetachedFromWindow();
- mPreviousStateView.setBackgroundDrawable(null);
- if (mPreviousStateBitmap != null) {
- mPreviousStateBitmap.recycle();
- mPreviousStateBitmap = null;
- }
- }
-
- public void startTransition(View view, boolean closing) {
- if (mPreviousAnimator != null && mPreviousAnimator.isRunning()) {
- mPreviousAnimator.end();
- }
- if (view.getVisibility() != View.VISIBLE) {
- if (!closing) {
- mPreviousAnimator = ObjectAnimator.ofFloat(view, View.ALPHA, 0.0f, 1.0f);
- mPreviousAnimator.start();
- }
- } else if (closing) {
- mPreviousAnimator = ObjectAnimator.ofFloat(view, View.ALPHA, 1.0f, 0.0f);
- mPreviousAnimator.start();
+ public void setMaskVisibility(boolean flag) {
+ if (flag) {
+ mMaskingView.setAlpha(1.0f);
+ mMaskingView.setVisibility(View.VISIBLE);
} else {
- if (view.getWidth() > 0 && view.getHeight() > 0) {
- // Take a "screenshot" of the current state of the screen and show that on top
- // of the real content. Then, fade that out.
- mPreviousStateBitmap = Bitmap.createBitmap(
- view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
- mPreviousStateView.setBackgroundDrawable(
- new BitmapDrawable(getContext().getResources(), mPreviousStateBitmap));
- mPreviousStateView.setLayoutParams(view.getLayoutParams());
- mPreviousStateBitmap.eraseColor(Color.WHITE);
- Canvas canvas = new Canvas(mPreviousStateBitmap);
- view.draw(canvas);
- canvas.setBitmap(null);
- mPreviousStateView.setVisibility(View.VISIBLE);
-
- mPreviousAnimator =
- ObjectAnimator.ofFloat(mPreviousStateView, View.ALPHA, 1.0f, 0.0f);
- mPreviousAnimator.start();
- }
+ mMaskingView.setVisibility(View.INVISIBLE);
}
}
- @Override
- public void onAnimationEnd(Animator animation) {
- mPreviousStateView.setVisibility(View.INVISIBLE);
- mPreviousStateView.setBackgroundDrawable(null);
- mPreviousStateBitmap.recycle();
- mPreviousStateBitmap = null;
- mPreviousAnimator = null;
- }
+ /**
+ * Starts the transition of showing or hiding the mask.
+ * If showMask is true, the mask will be set to be invisible then fade into hide the other
+ * views in this container. If showMask is false, the mask will be set to be hide other views
+ * initially. Then, the other views in this container will be revealed.
+ */
+ public void startMaskTransition(boolean showMask) {
+ // Stop any animation that may still be running.
+ if (mAnimator != null && mAnimator.isRunning()) {
+ mAnimator.end();
+ }
- @Override
- public void onAnimationCancel(Animator animation) {
- }
-
- @Override
- public void onAnimationStart(Animator animation) {
- }
-
- @Override
- public void onAnimationRepeat(Animator animation) {
+ mMaskingView.setVisibility(View.VISIBLE);
+ if (showMask) {
+ mAnimator = ObjectAnimator.ofFloat(mMaskingView, View.ALPHA, 0.0f, 1.0f);
+ mAnimator.start();
+ } else {
+ // asked to hide the view
+ mAnimator = ObjectAnimator.ofFloat(mMaskingView, View.ALPHA, 1.0f, 0.0f);
+ mAnimator.start();
+ }
}
}