Merge "Fix stream item pressed state" into jb-dev
diff --git a/res/layout-sw580dp-w940dp/contact_detail_fragment.xml b/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
index cf89727..9f32584 100644
--- a/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp-w940dp/contact_detail_fragment.xml
@@ -20,8 +20,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/background_primary"
- android:paddingRight="16dip">
+ android:background="@color/background_primary">
<!-- Placeholder for empty list -->
<include
@@ -51,7 +50,9 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:layout_weight="1"
- android:divider="@null"/>
+ android:divider="@null"
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingRight="16dip"/>
</LinearLayout>
diff --git a/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml b/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
index 3bcce3f..3b4b422 100644
--- a/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml
@@ -24,4 +24,5 @@
android:paddingTop="@dimen/contact_detail_list_top_padding"
android:paddingLeft="16dip"
android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"
android:clipToPadding="false"/>
diff --git a/res/layout-sw580dp/contact_detail_fragment.xml b/res/layout-sw580dp/contact_detail_fragment.xml
index 32b7cbb..fd6390e 100644
--- a/res/layout-sw580dp/contact_detail_fragment.xml
+++ b/res/layout-sw580dp/contact_detail_fragment.xml
@@ -35,7 +35,8 @@
android:fadingEdge="none"
android:cacheColorHint="#00000000"
android:divider="@null"
- />
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingRight="12dip" />
<!-- "QuickFix"- button (Copy to local contact, add to group) -->
<Button
diff --git a/res/layout-sw580dp/contact_detail_updates_fragment.xml b/res/layout-sw580dp/contact_detail_updates_fragment.xml
index d231dbc..a154936 100644
--- a/res/layout-sw580dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw580dp/contact_detail_updates_fragment.xml
@@ -24,6 +24,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fadingEdge="none"
- android:divider="@null"/>
+ android:divider="@null"
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingRight="12dip" />
</FrameLayout>
diff --git a/res/layout-sw580dp/updates_header_contact.xml b/res/layout-sw580dp/updates_header_contact.xml
index cb55a2d..b8b3278 100644
--- a/res/layout-sw580dp/updates_header_contact.xml
+++ b/res/layout-sw580dp/updates_header_contact.xml
@@ -29,7 +29,7 @@
class="com.android.contacts.widget.ProportionalLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="8dip"
+ android:layout_marginBottom="8dip"
ex:ratio="0.6667"
ex:direction="widthToHeight">
diff --git a/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml b/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
index e1a870a..b3f13a6 100644
--- a/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
+++ b/res/layout-sw680dp-w1000dp/contact_detail_fragment.xml
@@ -21,8 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_primary"
- android:paddingLeft="16dip"
- android:paddingRight="16dip">
+ android:paddingLeft="16dip">
<!-- Placeholder for empty list -->
<include
@@ -52,7 +51,9 @@
android:clipToPadding="false"
android:fadingEdge="none"
android:layout_weight="1"
- android:divider="@null"/>
+ android:divider="@null"
+ android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"/>
</LinearLayout>
diff --git a/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml b/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
index 439b8f0..d809258 100644
--- a/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw680dp-w1000dp/contact_detail_updates_fragment.xml
@@ -24,4 +24,5 @@
android:paddingTop="@dimen/contact_detail_list_top_padding"
android:paddingLeft="16dip"
android:paddingRight="16dip"
+ android:scrollbarStyle="outsideOverlay"
android:clipToPadding="false"/>
diff --git a/res/layout-sw680dp/contact_detail_fragment.xml b/res/layout-sw680dp/contact_detail_fragment.xml
index 3e4d255..4c6315e 100644
--- a/res/layout-sw680dp/contact_detail_fragment.xml
+++ b/res/layout-sw680dp/contact_detail_fragment.xml
@@ -35,7 +35,8 @@
android:fadingEdge="none"
android:cacheColorHint="#00000000"
android:divider="@null"
- />
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingRight="12dip" />
<!-- "QuickFix"- button (Copy to local contact, add to group) -->
<Button
diff --git a/res/layout-sw680dp/contact_detail_updates_fragment.xml b/res/layout-sw680dp/contact_detail_updates_fragment.xml
index 03a2e41..a2d1abb 100644
--- a/res/layout-sw680dp/contact_detail_updates_fragment.xml
+++ b/res/layout-sw680dp/contact_detail_updates_fragment.xml
@@ -24,6 +24,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fadingEdge="none"
- android:divider="@null"/>
+ android:divider="@null"
+ android:scrollbarStyle="outsideOverlay"
+ android:paddingRight="12dip" />
</FrameLayout>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 69b86e9..f18baed 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"ወደ መለያ ግባ"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"እውቅያዎችን ከውጭ አስመጣ"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"አዲስ ቡድን ፍጠር"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"አዲስ ቡድን ፍጠር"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 ቡድን"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g>ቡድኖች"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index a434892..435f47c 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Увайсці ва ўліковы запіс"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Імпартаваць кантакты"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Стварыць новую групу"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Стварыць новую групу"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 група"</item>
<item quantity="other" msgid="1276758425904917367">"Груп: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bf2bf34..0ce7374 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Вход в профил"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Импортиране на контактите"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Създаване на нова група"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Създаване на нова група"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 група"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> групи"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f5042f6..1e1bf59 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Přihlásit se do účtu"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importovat kontakty"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Vytvořit novou skupinu"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Vytvořit novou skupinu"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 skupina"</item>
<item quantity="other" msgid="1276758425904917367">"Skupiny: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 58d64b5..51f01ce 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Log ind på en konto"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importer kontaktpersoner"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Opret en ny gruppe"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Opret en ny gruppe"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 gruppe"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grupper"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0e24834..1ee13e9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"In einem Konto anmelden"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Kontakte importieren"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Neue Gruppe erstellen"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Neue Gruppe erstellen"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 Gruppe"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> Gruppen"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 70af182..6eb32a2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Σύνδεση σε έναν λογαριασμό"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Εισαγωγή επαφών"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Δημιουργία νέας ομάδας"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Δημιουργία νέας ομάδας"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 ομάδα"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> ομάδες"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f5c0b91..07afea7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Nombres de tus contactos"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Agregar pausa de 2 segundos"</string>
<string name="add_wait" msgid="3360818652790319634">"Agregar espera"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Elije un número"</string>
<string name="call_settings" msgid="7666474782093693667">"Configuración"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Elije un número"</string>
<string name="make_primary" msgid="5829291915305113983">"Recuerda esta opción"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"No se encontró ninguna aplicación que pueda realizar esta acción."</string>
<string name="missing_name" msgid="8745511583852904385">"(Sin nombre)"</string>
@@ -475,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Accede a una cuenta"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importar contactos"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Crear grupo nuevo"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Crear grupo nuevo"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupo"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grupos"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 20070b7..0dfc7d6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Logi kontole sisse"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Impordi kontaktid"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Uue grupi loomine"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Loo uus rühm"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupp"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> rühma"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 84be27c..f83fc5f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"نام های مخاطبین شما"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"افزودن یک مکث 2 ثانیه ای"</string>
<string name="add_wait" msgid="3360818652790319634">"افزودن انتظار"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"انتخاب شماره"</string>
<string name="call_settings" msgid="7666474782093693667">"تنظیمات"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"انتخاب شماره"</string>
<string name="make_primary" msgid="5829291915305113983">"این گزینه را به خاطر بسپار"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"برنامهای برای انجام این عملکرد یافت نشد."</string>
<string name="missing_name" msgid="8745511583852904385">"(بدون نام)"</string>
@@ -475,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"وارد شدن به یک حساب"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"وارد کردن مخاطبین"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"ایجاد گروه جدید"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"ایجاد گروه جدید"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 گروه"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> گروه"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8d423c1..1349934 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Kirjaudu tiliin"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Tuo yhteystietoja"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Luo uusi ryhmä"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Luo uusi ryhmä"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 ryhmä"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> ryhmää"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e67f683..805288a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Se connecter à un compte"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importer des contacts"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Créer un groupe"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Créer un groupe"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"Un groupe"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> groupes"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e98fc31..4909eea 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"किसी खाते में साइन इन करें"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"संपर्क आयात करें"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"नया समूह बनाएं"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"नया समूह बनाएं"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 समूह"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> समूह"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3f68fd8..83e62c7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Prijavi se na račun"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Uvezi kontakte"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Izrada nove grupe"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Izrada nove grupe"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupa"</item>
<item quantity="other" msgid="1276758425904917367">"Br. grupa: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b681520..d1a6792 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Jelentkezzen be fiókjába"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Névjegyek importálása"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Új csoport létrehozása"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Új csoport létrehozása"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 csoport"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> csoport"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 1fd4eca..6d47924 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Masuk ke akun."</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Impor kontak"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Buat grup baru"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Buat grup baru"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grup"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grup"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ecafcd1..36e4b20 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"היכנס לחשבון"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"יבא אנשי קשר"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"צור קבוצה חדשה"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"צור קבוצה חדשה"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"קבוצה אחת"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> קבוצות"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 177a652..43f97e6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"アカウントにログイン"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"連絡先をインポート"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"新しいグループの作成"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"新しいグループを作成"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1グループ"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g>グループ"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4128829..3ad8c25 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"계정에 로그인"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"주소록 가져오기"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"새 그룹 만들기"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"새 그룹 만들기"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"그룹 1개"</item>
<item quantity="other" msgid="1276758425904917367">"그룹 <xliff:g id="COUNT">%0$d</xliff:g>개"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7c0472f..3d8fa17 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Prisijunkite prie paskyros"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importuoti kontaktus"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Sukurti naują grupę"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Sukurti naują grupę"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupė"</item>
<item quantity="other" msgid="1276758425904917367">"Grupių: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7c4f9d2..f6b77b1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Pierakstīties kontā"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importēt kontaktpersonas"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Jaunas grupas izveide"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Izveidot jaunu grupu"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupa"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grupas"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 5443b89..a24b5cf 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -475,8 +475,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Log masuk ke akaun"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Import kenalan"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Buat kumpulan baru"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Buat kumpulan baharu"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 kumpulan"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> kumpulan"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dd9ef9f..2496659 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Logg deg på en konto"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importer kontakter"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Opprett ny gruppe"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Opprett en ny gruppe"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"Én gruppe"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grupper"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bc970f8..86d19fb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Aanmelden bij een account"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Contacten importeren"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Nieuwe groep maken"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Nieuwe groep maken"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 groep"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> groepen"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c5062d7..a411d96 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Zaloguj się na konto"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importuj kontakty"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Utwórz nową grupę"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Utwórz nową grupę"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grupa"</item>
<item quantity="other" msgid="1276758425904917367">"Grupy: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8dd5de7..36774a9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Conectaţi-vă la un cont"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importaţi Agenda"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Creaţi un grup nou"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Creaţi un grup nou"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grup"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> (de) grupuri"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0083256..9dd0e0e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -473,7 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Войдите в аккаунт"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Импортировать контакты"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Создание новой группы"</string>
- <string name="create_group_item_label" msgid="4411981763169654825">"Создать новую группу"</string>
+ <string name="create_group_item_label" msgid="4411981763169654825">"Создать группу"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 группа"</item>
<item quantity="other" msgid="1276758425904917367">"Групп: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c6cb9ab..72735c8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Prihlásiť sa do účtu"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importovať kontakty"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Vytvoriť novú skupinu"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Vytvoriť novú skupinu"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"Počet skupín: 1"</item>
<item quantity="other" msgid="1276758425904917367">"Počet skupín: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 119833f..3c2d7c8 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -278,11 +278,9 @@
<string name="search_settings_description" msgid="2675223022992445813">"Imena stikov"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"Dodaj 2 sekundi premora"</string>
<string name="add_wait" msgid="3360818652790319634">"Dodaj premor"</string>
- <!-- no translation found for call_disambig_title (4392886850104795739) -->
- <skip />
+ <string name="call_disambig_title" msgid="4392886850104795739">"Izberite številko"</string>
<string name="call_settings" msgid="7666474782093693667">"Nastavitve"</string>
- <!-- no translation found for sms_disambig_title (5846266399240630846) -->
- <skip />
+ <string name="sms_disambig_title" msgid="5846266399240630846">"Izberite številko"</string>
<string name="make_primary" msgid="5829291915305113983">"Zapomni si to izbiro"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Programa za obravnavo tega dejanja ni mogoče najti."</string>
<string name="missing_name" msgid="8745511583852904385">"(Ni imena)"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 91fdf49..ef6d21a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Пријавите се на налог"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Увези контакте"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Прављење нове групе"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Направи нову групу"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 група"</item>
<item quantity="other" msgid="1276758425904917367">"Група: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eb48444..2e7e052 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"ลงชื่อเข้าใช้บัญชี"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"นำเข้าสมุดโทรศัพท์"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"สร้างกลุ่มใหม่"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"สร้างกลุ่มใหม่"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 กลุ่ม"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> กลุ่ม"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d33e4ba..07643af 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Mag-sign in sa isang account"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Mag-import ng mga contact"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Lumikha ng bagong pangkat"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Lumikha ng bagong pangkat"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 pangkat"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> (na) pangkat"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ddf1c91..82ef250 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Bir hesapta oturum açın"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Kişileri içe aktar"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Yeni grup oluştur"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Yeni grup oluştur"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 grup"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grup"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fe0bb63..33ac75e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Увійти в обліковий запис"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Імпортувати контакти"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Створити нову групу"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Створити нову групу"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 група"</item>
<item quantity="other" msgid="1276758425904917367">"Груп: <xliff:g id="COUNT">%0$d</xliff:g>"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 31b0ce2..f825411 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Đăng nhập vào tài khoản"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Nhập danh bạ"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Tạo nhóm mới"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Tạo nhóm mới"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 nhóm"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> nhóm"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c8458b6..d069f9c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"登录帐户"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"导入联系人"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"创建新群组"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"创建新群组"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 个群组"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> 个群组"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ff840ec..e7ce3d7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"登入帳戶"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"匯入聯絡人"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"建立新群組"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"建立新群組"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 個群組"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> 個群組"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d2504cf..d997f59 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -473,8 +473,7 @@
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Ngena ngemvume kwi-akhawunti"</string>
<string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Ngenisa othintana nabo"</string>
<string name="create_group_dialog_title" msgid="6874527142828424475">"Dala iqembu elisha"</string>
- <!-- no translation found for create_group_item_label (4411981763169654825) -->
- <skip />
+ <string name="create_group_item_label" msgid="4411981763169654825">"Dala iqembu elisha"</string>
<plurals name="num_groups_in_account">
<item quantity="one" msgid="2944819210288517794">"1 isigcawu"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> Amaqembu"</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c53e03f..5037279 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,8 +16,6 @@
<resources>
<dimen name="account_selector_popup_width">400dip</dimen>
- <dimen name="photo_action_popup_width">400dip</dimen>
-
<!-- Top position of quick contact. If this is -1, the vertical position is determined
based on the source of the request -->
<dimen name="quick_contact_top_position">48dip</dimen>
@@ -82,6 +80,16 @@
<!-- Width and height of the contact photo on the contact detail page -->
<dimen name="detail_contact_photo_size">128dip</dimen>
+ <!-- Width and height of the expanded contact photo on the contact detail page -->
+ <dimen name="detail_contact_photo_expanded_size">400dip</dimen>
+
+ <!-- This is the minimum amount of space to leave underneath an expanded contact detail
+ photo -->
+ <dimen name="expanded_photo_height_offset">100dip</dimen>
+
+ <!-- Minimum width for the photo action popup options -->
+ <dimen name="photo_action_popup_min_width">300dip</dimen>
+
<!-- Left and right padding for a contact detail item -->
<dimen name="detail_item_icon_margin">8dip</dimen>
diff --git a/src/com/android/contacts/activities/PhotoSelectionActivity.java b/src/com/android/contacts/activities/PhotoSelectionActivity.java
index 0610bb6..21cf192 100644
--- a/src/com/android/contacts/activities/PhotoSelectionActivity.java
+++ b/src/com/android/contacts/activities/PhotoSelectionActivity.java
@@ -37,7 +37,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Parcelable;
-import android.util.Log;
import android.view.View;
import android.view.ViewGroup.MarginLayoutParams;
import android.widget.FrameLayout.LayoutParams;
@@ -105,6 +104,15 @@
/** Whether to animate the photo to an expanded view covering more of the screen. */
private boolean mExpandPhoto;
+ /**
+ * Side length (in pixels) of the expanded photo if to be expanded. Photos are expected to
+ * be square.
+ */
+ private int mExpandedPhotoSize;
+
+ /** Height (in pixels) to leave underneath the expanded photo to show the list popup */
+ private int mHeightOffset;
+
/** The semi-transparent backdrop. */
private View mBackdrop;
@@ -164,6 +172,12 @@
mIsDirectoryContact = intent.getBooleanExtra(IS_DIRECTORY_CONTACT, false);
mExpandPhoto = intent.getBooleanExtra(EXPAND_PHOTO, false);
+ // Pull out photo expansion properties from resources
+ mExpandedPhotoSize = getResources().getDimensionPixelSize(
+ R.dimen.detail_contact_photo_expanded_size);
+ mHeightOffset = getResources().getDimensionPixelOffset(
+ R.dimen.expanded_photo_height_offset);
+
mBackdrop = findViewById(R.id.backdrop);
mPhotoView = (ImageView) findViewById(R.id.photo);
mSourceBounds = intent.getSourceBounds();
@@ -188,6 +202,30 @@
});
}
+ /**
+ * Compute the adjusted expanded photo size to fit within the enclosing view with the same
+ * aspect ratio.
+ * @param enclosingView This is the view that the photo must fit within.
+ * @param heightOffset This is the amount of height to leave open for the photo action popup.
+ */
+ private int getAdjustedExpandedPhotoSize(View enclosingView, int heightOffset) {
+ // pull out the bounds of the backdrop
+ final Rect bounds = new Rect();
+ enclosingView.getDrawingRect(bounds);
+ final int boundsWidth = bounds.width();
+ final int boundsHeight = bounds.height() - heightOffset;
+
+ // ensure that the new expanded photo size can fit within the backdrop
+ final float alpha = Math.min((float) boundsHeight / (float) mExpandedPhotoSize,
+ (float) boundsWidth / (float) mExpandedPhotoSize);
+ if (alpha < 1.0f) {
+ // need to shrink width and height while maintaining aspect ratio
+ return (int) (alpha * mExpandedPhotoSize);
+ } else {
+ return mExpandedPhotoSize;
+ }
+ }
+
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
@@ -279,7 +317,6 @@
// Load the photo.
int photoWidth = getPhotoEndParams().width;
- Log.d(TAG, "Photo width: " + photoWidth);
if (mPhotoUri != null) {
// If we have a URI, the bitmap should be cached directly.
ContactPhotoManager.getInstance(this).loadPhoto(mPhotoView, mPhotoUri, photoWidth,
@@ -317,25 +354,32 @@
attachPhotoHandler();
}
+ /**
+ * This sets the photo's layout params at the end of the animation.
+ * <p>
+ * The scheme is to enlarge the photo to the desired size with the enlarged photo shifted
+ * to the top left of the screen as much as possible while keeping the underlying smaller
+ * photo occluded.
+ */
private LayoutParams getPhotoEndParams() {
if (mPhotoEndParams == null) {
mPhotoEndParams = new LayoutParams(mPhotoStartParams);
if (mExpandPhoto) {
- Rect bounds = new Rect();
- mBackdrop.getDrawingRect(bounds);
- if (bounds.height() > bounds.width()) {
- //Take up full width.
- mPhotoEndParams.width = bounds.width();
- mPhotoEndParams.height = bounds.width();
- } else {
- // Take up full height, leaving space for the popup.
- mPhotoEndParams.height = bounds.height() - 150;
- mPhotoEndParams.width = bounds.height() - 150;
+ final int adjustedPhotoSize = getAdjustedExpandedPhotoSize(mBackdrop,
+ mHeightOffset);
+ int widthDelta = adjustedPhotoSize - mPhotoStartParams.width;
+ int heightDelta = adjustedPhotoSize - mPhotoStartParams.height;
+ if (widthDelta >= 1 || heightDelta >= 1) {
+ // This is an actual expansion.
+ mPhotoEndParams.width = adjustedPhotoSize;
+ mPhotoEndParams.height = adjustedPhotoSize;
+ mPhotoEndParams.topMargin =
+ Math.max(mPhotoStartParams.topMargin - heightDelta, 0);
+ mPhotoEndParams.leftMargin =
+ Math.max(mPhotoStartParams.leftMargin - widthDelta, 0);
+ mPhotoEndParams.bottomMargin = 0;
+ mPhotoEndParams.rightMargin = 0;
}
- mPhotoEndParams.topMargin = 0;
- mPhotoEndParams.leftMargin = 0;
- mPhotoEndParams.bottomMargin = mPhotoEndParams.height;
- mPhotoEndParams.rightMargin = mPhotoEndParams.width;
}
}
return mPhotoEndParams;
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 29aa51a..c91f493 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -298,7 +298,6 @@
mPhotoTouchOverlay = mView.findViewById(R.id.photo_touch_intercept_overlay);
mListView = (ListView) mView.findViewById(android.R.id.list);
- mListView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
mListView.setOnItemClickListener(this);
mListView.setItemsCanFocus(true);
mListView.setOnScrollListener(mVerticalScrollListener);
@@ -425,12 +424,14 @@
// updates or not.
if (mShowStaticPhoto) {
mStaticPhotoContainer.setVisibility(View.VISIBLE);
- ImageView photoView = (ImageView) mStaticPhotoContainer.findViewById(R.id.photo);
- OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
- mContext, mContactData, photoView, false);
+ final ImageView photoView = (ImageView) mStaticPhotoContainer.findViewById(
+ R.id.photo);
+ final boolean expandPhotoOnClick = mContactData.getPhotoUri() != null;
+ final OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
+ mContext, mContactData, photoView, expandPhotoOnClick);
if (mPhotoTouchOverlay != null) {
mPhotoTouchOverlay.setVisibility(View.VISIBLE);
- if (mContactData.isWritableContact(mContext)) {
+ if (expandPhotoOnClick || mContactData.isWritableContact(mContext)) {
mPhotoTouchOverlay.setOnClickListener(listener);
} else {
mPhotoTouchOverlay.setClickable(false);
@@ -1524,8 +1525,8 @@
// Set the photo if it should be displayed
if (viewCache.photoView != null) {
- final boolean expandOnClick = !PhoneCapabilityTester.isUsingTwoPanes(mContext);
- OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
+ final boolean expandOnClick = mContactData.getPhotoUri() != null;
+ final OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
mContext, mContactData, viewCache.photoView, expandOnClick);
if (expandOnClick || mContactData.isWritableContact(mContext)) {
diff --git a/src/com/android/contacts/detail/ContactDetailPhotoSetter.java b/src/com/android/contacts/detail/ContactDetailPhotoSetter.java
index b674dc0..dffb37b 100644
--- a/src/com/android/contacts/detail/ContactDetailPhotoSetter.java
+++ b/src/com/android/contacts/detail/ContactDetailPhotoSetter.java
@@ -72,6 +72,7 @@
final int[] pos = new int[2];
v.getLocationOnScreen(pos);
+ // rect is the bounds (in pixels) of the photo view in screen coordinates
final Rect rect = new Rect();
rect.left = (int) (pos[0] * appScale + 0.5f);
rect.top = (int) (pos[1] * appScale + 0.5f);
diff --git a/src/com/android/contacts/detail/ContactDetailTabCarousel.java b/src/com/android/contacts/detail/ContactDetailTabCarousel.java
index dd0723d..3929281 100644
--- a/src/com/android/contacts/detail/ContactDetailTabCarousel.java
+++ b/src/com/android/contacts/detail/ContactDetailTabCarousel.java
@@ -472,8 +472,8 @@
// TODO: Move this into the {@link CarouselTab} class when the updates
// fragment code is more finalized.
- final boolean expandOnClick = !PhoneCapabilityTester.isUsingTwoPanes(mContext);
- OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
+ final boolean expandOnClick = contactData.getPhotoUri() != null;
+ final OnClickListener listener = mPhotoSetter.setupContactPhotoForClick(
mContext, contactData, mPhotoView, expandOnClick);
if (expandOnClick || contactData.isWritableContact(mContext)) {
diff --git a/src/com/android/contacts/editor/PhotoActionPopup.java b/src/com/android/contacts/editor/PhotoActionPopup.java
index 9744308..a27dd8a 100644
--- a/src/com/android/contacts/editor/PhotoActionPopup.java
+++ b/src/com/android/contacts/editor/PhotoActionPopup.java
@@ -126,10 +126,13 @@
listPopupWindow.setAnchorView(anchorView);
listPopupWindow.setAdapter(adapter);
listPopupWindow.setOnItemClickListener(clickListener);
- listPopupWindow.setWidth(context.getResources().getDimensionPixelSize(
- R.dimen.photo_action_popup_width));
listPopupWindow.setModal(true);
listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
+ final int minWidth = context.getResources().getDimensionPixelSize(
+ R.dimen.photo_action_popup_min_width);
+ if (anchorView.getWidth() < minWidth) {
+ listPopupWindow.setWidth(minWidth);
+ }
return listPopupWindow;
}