merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d84e774..b175952 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -401,7 +401,7 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"ይህን ፎቶ ተጠቀም"</string>
<string name="contact_read_only" msgid="7421346527289472273">"ከዚህ መተግበሪያ አርትዕ ሊደረግ አይችልም፡፡"</string>
- <string name="no_contact_details" msgid="6636856378019344497">"ለዚህ ዕውቂያ ምንም ተጨማሪ መረጃ የለም"</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"ለእዚህ ዕውቂያ ምንም ተጨማሪ መረጃ የለም"</string>
<string name="group_read_only" msgid="1061762906115697637">"በዚህ መሣሪያ ላይ አርትዕ መደረግ የሚችል አይደለም።"</string>
<string name="display_options_sort_list_by" msgid="6080091755852211076">"ዝርዝር በ ለይ"</string>
<string name="display_options_sort_by_given_name" msgid="184916793466387067">"መጠሪያ ስም"</string>
diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 87c321e..3dfaf8d 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -458,6 +458,7 @@
Collapser.collapseList(mEmailEntries);
Collapser.collapseList(mPostalEntries);
Collapser.collapseList(mImEntries);
+ Collapser.collapseList(mEventEntries);
mIsUniqueNumber = mPhoneEntries.size() == 1;
mIsUniqueEmail = mEmailEntries.size() == 1;
diff --git a/src/com/android/contacts/detail/ContactLoaderFragment.java b/src/com/android/contacts/detail/ContactLoaderFragment.java
index 37fabb0..b3f1264 100644
--- a/src/com/android/contacts/detail/ContactLoaderFragment.java
+++ b/src/com/android/contacts/detail/ContactLoaderFragment.java
@@ -216,7 +216,7 @@
}
}
// Make sure the options menu is setup correctly with the loaded data.
- getActivity().invalidateOptionsMenu();
+ if (getActivity() != null) getActivity().invalidateOptionsMenu();
}
@Override