Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb3c46a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Added old voicemail to NUI activity."

parents 8520ae1d d7f51ef3

java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import com.android.dialer.app.R;

import com.android.dialer.app.list.ListsFragment;

import com.android.dialer.app.voicemail.VoicemailAudioManager;

import com.android.dialer.app.voicemail.VoicemailErrorManager;

import com.android.dialer.app.voicemail.VoicemailPlaybackPresenter;

import com.android.dialer.common.FragmentUtils;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.DialerExecutor;

import com.android.dialer.common.concurrent.DialerExecutorComponent;
@@ -151,7 +151,7 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { 
  @Override

  public void fetchCalls() {

    super.fetchCalls();

    ((ListsFragment) getParentFragment()).updateTabUnreadCounts();

    FragmentUtils.getParentUnsafe(this, CallLogFragmentListener.class).updateTabUnreadCounts();

  }



  @Override

java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java

+4 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import com.android.dialer.constants.Constants; 
import com.android.dialer.logging.DialerImpression;

import com.android.dialer.logging.Logger;

import com.android.dialer.phonenumbercache.CallLogQuery;

import com.android.dialer.strictmode.StrictModeUtils;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.util.PermissionsUtil;

import com.google.common.io.ByteStreams;
@@ -518,7 +519,10 @@ public class VoicemailPlaybackPresenter 
      handleError(new IllegalStateException("Cannot play voicemail when call is in progress"));

      return;

    }

    StrictModeUtils.bypass(this::prepareMediaPlayer);

  }



  private void prepareMediaPlayer() {

    try {

      mediaPlayer = new MediaPlayer();

      mediaPlayer.setOnPreparedListener(this);

java/com/android/dialer/main/impl/MainActivity.java

+29 −8
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.dialer.app.calllog.CallLogAdapter; 
import com.android.dialer.app.calllog.CallLogFragment;

import com.android.dialer.app.calllog.CallLogFragment.CallLogFragmentListener;

import com.android.dialer.app.calllog.CallLogNotificationsService;

import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;

import com.android.dialer.app.list.DragDropController;

import com.android.dialer.app.list.OldSpeedDialFragment;

import com.android.dialer.app.list.OnDragDropListener;
@@ -789,6 +790,9 @@ public final class MainActivity extends TransactionSafeActivity 
    @Override

    public void onVoicemailSelected() {

      hideAllFragments();

      if (ConfigProviderComponent.get(context)

          .getConfigProvider()

          .getBoolean("enable_new_voicemail_fragment", false)) {

        NewVoicemailFragment fragment =

            (NewVoicemailFragment) supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG);

        if (fragment == null) {
@@ -799,6 +803,18 @@ public final class MainActivity extends TransactionSafeActivity 
        } else {

          supportFragmentManager.beginTransaction().show(fragment).commit();

        }

      } else {

        VisualVoicemailCallLogFragment fragment =

            (VisualVoicemailCallLogFragment) fragmentManager.findFragmentByTag(VOICEMAIL_TAG);

        if (fragment == null) {

          fragmentManager

              .beginTransaction()

              .add(R.id.fragment_container, new VisualVoicemailCallLogFragment(), VOICEMAIL_TAG)

              .commit();

        } else {

          fragmentManager.beginTransaction().show(fragment).commit();

        }

      }

    }



    private void hideAllFragments() {
@@ -808,6 +824,7 @@ public final class MainActivity extends TransactionSafeActivity 
        supportTransaction.hide(supportFragmentManager.findFragmentByTag(CALL_LOG_TAG));

      }

      if (supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG) != null) {

        // NewVoicemailFragment

        supportTransaction.hide(supportFragmentManager.findFragmentByTag(VOICEMAIL_TAG));

      }

      supportTransaction.commit();
@@ -823,6 +840,10 @@ public final class MainActivity extends TransactionSafeActivity 
      if (fragmentManager.findFragmentByTag(CONTACTS_TAG) != null) {

        transaction.hide(fragmentManager.findFragmentByTag(CONTACTS_TAG));

      }

      if (fragmentManager.findFragmentByTag(VOICEMAIL_TAG) != null) {

        // Old VisualVoicemailFragment

        transaction.hide(fragmentManager.findFragmentByTag(VOICEMAIL_TAG));

      }

      transaction.commit();

    }

  }