merge in klp-release history after reset to klp-dev
diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
index 409b16e..723665f 100644
--- a/res/layout/quickcontact_photo_container.xml
+++ b/res/layout/quickcontact_photo_container.xml
@@ -25,7 +25,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
- android:clickable="true" />
+ android:clickable="true"
+ android:contentDescription="@string/description_contact_photo" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
@@ -40,11 +41,10 @@
android:layout_alignRight="@id/photo"
android:layout_alignStart="@id/photo"
android:layout_alignEnd="@id/photo"
- android:background="@color/quickcontact_name_detail_background"/>
+ android:background="@color/quickcontact_name_detail_background" />
<ImageView
android:id="@+id/contact_details_image"
android:src="@drawable/ic_contacts_holo_dark"
- android:contentDescription="@null"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="16dip"
@@ -53,7 +53,8 @@
android:layout_alignBottom="@id/photo_text_bar"
android:layout_alignRight="@id/photo_text_bar"
android:layout_alignEnd="@id/photo_text_bar"
- android:clickable="true"/>
+ android:clickable="true"
+ android:contentDescription="@string/viewContactDesription" />
<ImageView
android:id="@+id/quickcontact_star_button"
android:src="@drawable/ic_favorite_off_lt"
@@ -65,7 +66,8 @@
android:layout_alignBottom="@id/photo_text_bar"
android:layout_toLeftOf="@id/contact_details_image"
android:layout_toStartOf="@id/contact_details_image"
- android:clickable="true"/>
+ android:clickable="true"
+ android:contentDescription="@string/menu_addStar" />
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 603cc38..b553fa0 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,7 +78,7 @@
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Der er ingen tilgængelige billeder på telefonen."</string>
<string name="attach_photo_dialog_title" msgid="5599827035558557169">"Billede af kontaktperson"</string>
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Navn på tilpasset etiket"</string>
- <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Send opkald direkte til voicemail"</string>
+ <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Send opkald direkte til telefonsvarer"</string>
<string name="removePhoto" msgid="4898105274130284565">"Fjern billede"</string>
<string name="noContacts" msgid="8579310973261953559">"Der er ingen kontakter."</string>
<string name="noGroups" msgid="8614664663561385253">"Ingen grupper."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e978a6a..8e23801 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -206,7 +206,7 @@
<item quantity="one" msgid="3323065321661972446">"<xliff:g id="COUNT">%1$d</xliff:g> osoba"</item>
<item quantity="other" msgid="6251996206137048525">"Osoby: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Wpisz w kontakcie imię i nazwisko, zanim połączysz go z innym kontaktem."</string>
+ <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Wpisz imię i nazwisko, zanim połączysz ten kontakt z innym."</string>
<string name="copy_text" msgid="3257145021583508761">"Kopiuj do schowka"</string>
<string name="set_default" msgid="4417505153468300351">"Ustaw jako wartość domyślną"</string>
<string name="clear_default" msgid="7193185801596678067">"Wyczyść wartość domyślną"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 27a436f..2fab5d4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -69,7 +69,7 @@
<string name="invalidContactMessage" msgid="8215051456181842274">"Mwasiliani hayupo."</string>
<string name="createContactShortcutSuccessful" msgid="7874133287558150877">"Wijeti ya mawasiliano imeongezwa kwenye skrini ya Nyumbani."</string>
<string name="pickerNewContactHeader" msgid="7750705279843568147">"Weka anwani mpya"</string>
- <string name="pickerNewContactText" msgid="6166997164401048211">"Anzisha mwasiliani mpya"</string>
+ <string name="pickerNewContactText" msgid="6166997164401048211">"Ongeza anwani mpya"</string>
<string-array name="otherLabels">
<item msgid="8287841928119937597">"Shirika"</item>
<item msgid="7196592230748086755">"Hati"</item>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index c2f2ab8..01116d7 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -17,6 +17,7 @@
<style name="PeopleTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ContactsActionBarStyle</item>
<item name="android:actionBarWidgetTheme">@style/ContactsActionBarTheme</item>
+ <item name="android:actionOverflowButtonStyle">@style/ContactsActionBarOverflow</item>
<item name="android:actionBarItemBackground">@drawable/action_bar_item_background</item>
<item name="android:actionBarTabStyle">@style/ContactsActionBarTabView</item>
<item name="android:actionDropDownStyle">@style/ContactsActionBarDropDownStyle</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8326603..dd0406b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -451,10 +451,10 @@
<!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
<string name="group_edit_field_hint_text">Group name</string>
- <!-- Attbution of a contact status update, when the time of update is unknown -->
+ <!-- Attribution of a contact status update, when the time of update is unknown -->
<string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
- <!-- Attbution of a contact status update, when the time of update is known -->
+ <!-- Attribution of a contact status update, when the time of update is known -->
<string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
<!-- String describing the Star/Favorite checkbox
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 15e119b..c7d6e51 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -375,8 +375,12 @@
final boolean isStarred = data.getStarred();
if (isStarred) {
mStarImage.setImageResource(R.drawable.ic_favorite_on_lt);
+ mStarImage.setContentDescription(
+ getResources().getString(R.string.menu_removeStar));
} else {
mStarImage.setImageResource(R.drawable.ic_favorite_off_lt);
+ mStarImage.setContentDescription(
+ getResources().getString(R.string.menu_addStar));
}
final Uri lookupUri = data.getLookupUri();