diff --git a/src/com/android/mms/ui/ConversationList.java b/src/com/android/mms/ui/ConversationList.java index 9cc333329fe46e48b75fe1b200d86294138510e0..cf18d704cf90071422ddef6882fda03c8e5894e2 100755 --- a/src/com/android/mms/ui/ConversationList.java +++ b/src/com/android/mms/ui/ConversationList.java @@ -413,12 +413,14 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft ViewGroup v = (ViewGroup)LayoutInflater.from(this) .inflate(R.layout.conversation_list_actionbar, null); - actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, - ActionBar.DISPLAY_SHOW_CUSTOM); - actionBar.setCustomView(v, - new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT, + if (actionBar != null) { + actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, + ActionBar.DISPLAY_SHOW_CUSTOM); + actionBar.setCustomView(v, + new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT, Gravity.CENTER_VERTICAL | Gravity.END)); + } mUnreadConvCount = (TextView)v.findViewById(R.id.unread_conv_count); }