diff options
author | Andrew Lee <anwlee@google.com> | 2015-05-14 17:26:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 17:26:18 +0000 |
commit | 46b5395dd275ae99dfd5b8e5185f7bbfbaf053c8 (patch) | |
tree | 917c3a80e6fd7e9616d4ca1f3f1bae8435400568 /src | |
parent | 39ab347ff3ca74f8c0ae2c5d3e5e7ea1f64815b0 (diff) | |
parent | bad58ac9eb49521e3fe37207648d4aa95766e5eb (diff) |
Merge "Don't set voicemail status message in Call Log." into mnc-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogFragment.java | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java index 4948176c1..e8ed17ec6 100644 --- a/src/com/android/dialer/calllog/CallLogFragment.java +++ b/src/com/android/dialer/calllog/CallLogFragment.java @@ -93,10 +93,7 @@ public class CallLogFragment extends Fragment private boolean mVoicemailSourcesAvailable = false; private VoicemailStatusHelper mVoicemailStatusHelper; - private View mStatusMessageView; private View mEmptyListView; - private TextView mStatusMessageText; - private TextView mStatusMessageAction; private KeyguardManager mKeyguardManager; private boolean mEmptyLoaderRunning; @@ -249,16 +246,6 @@ public class CallLogFragment extends Fragment if (activity == null || activity.isFinishing()) { return; } - updateVoicemailStatusMessage(statusCursor); - - // If there are any changes to the presence of active voicemail services, invalidate the - // options menu so that it will be updated. - boolean hasActiveVoicemailSources = - mVoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor) != 0; - if (mVoicemailSourcesAvailable != hasActiveVoicemailSources) { - mVoicemailSourcesAvailable = hasActiveVoicemailSources; - activity.invalidateOptionsMenu(); - } mVoicemailStatusFetched = true; destroyEmptyLoaderIfAllDataFetched(); @@ -291,9 +278,6 @@ public class CallLogFragment extends Fragment mRecyclerView.setAdapter(mAdapter); mVoicemailStatusHelper = new VoicemailStatusHelperImpl(); - mStatusMessageView = view.findViewById(R.id.voicemail_status); - mStatusMessageText = (TextView) view.findViewById(R.id.voicemail_status_message); - mStatusMessageAction = (TextView) view.findViewById(R.id.voicemail_status_action); return view; } @@ -335,35 +319,6 @@ public class CallLogFragment extends Fragment refreshData(); } - private void updateVoicemailStatusMessage(Cursor statusCursor) { - List<StatusMessage> messages = mVoicemailStatusHelper.getStatusMessages(statusCursor); - if (messages.size() == 0) { - mStatusMessageView.setVisibility(View.GONE); - } else { - mStatusMessageView.setVisibility(View.VISIBLE); - // TODO: Change the code to show all messages. For now just pick the first message. - final StatusMessage message = messages.get(0); - if (message.showInCallLog()) { - mStatusMessageText.setText(message.callLogMessageId); - } - if (message.actionMessageId != -1) { - mStatusMessageAction.setText(message.actionMessageId); - } - if (message.actionUri != null) { - mStatusMessageAction.setVisibility(View.VISIBLE); - mStatusMessageAction.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - getActivity().startActivity( - new Intent(Intent.ACTION_VIEW, message.actionUri)); - } - }); - } else { - mStatusMessageAction.setVisibility(View.GONE); - } - } - } - @Override public void onPause() { super.onPause(); |