commit a4e88c594cb6cd2b8a7aa878497f374145cff2e1
author Baligh Uddin <baligh@google.com> Wed Aug 22 20:30:50 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 20:30:50 2012 -0700
tree aa10690fb2228b64f8f5c83656a8d2c69b2685e1
parent 3d4bed1ed0ebf8df211bb03cc89d1327dd492aef
parent 841b791ae31968697bd432847e9df2d1e1c905ea

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

src/com/android/contacts/detail/ContactDetailFragment.java

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;

src/com/android/contacts/detail/ContactLoaderFragment.java

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