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

Commit b394d18d authored by Eric Erfanian's avatar Eric Erfanian Committed by Gerrit Code Review
Browse files

Merge changes Ib3ed6636,I10e10124,I84dbef78,I7ba7b0d8,Id00e8e3e 

* changes:
  UI refresh for voice call screen.
  Improved testability.
  Don't submit fragment transaction to show search when the activity state has been saved.
  Remove suggestion from NUI favorite
  Reset speaker mode when done with VVM Tab
parents 336cc00d b6c615db

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,12 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { 
  public void onPause() {

  public void onPause() {

    voicemailPlaybackPresenter.onPause();

    voicemailPlaybackPresenter.onPause();

    voicemailErrorManager.onPause();

    voicemailErrorManager.onPause();

    // Necessary to reset the speaker when leaving otherwise the platform will still remain in

    // speaker mode

    AudioManager audioManager = getContext().getSystemService(AudioManager.class);

    if (audioManager.isSpeakerphoneOn()) {

      audioManager.setSpeakerphoneOn(false);

    }

    super.onPause();

    super.onPause();

  }

  }

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.database.ContentObserver;

import android.database.ContentObserver;

import android.database.Cursor;

import android.database.Cursor;

import android.media.AudioManager;

import android.media.MediaPlayer;

import android.media.MediaPlayer;

import android.net.Uri;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.AsyncTask;
@@ -207,6 +208,8 @@ public class VoicemailPlaybackPresenter 
      position = savedInstanceState.getInt(CLIP_POSITION_KEY, 0);

      position = savedInstanceState.getInt(CLIP_POSITION_KEY, 0);

      isPlaying = savedInstanceState.getBoolean(IS_PLAYING_STATE_KEY, false);

      isPlaying = savedInstanceState.getBoolean(IS_PLAYING_STATE_KEY, false);

      isSpeakerphoneOn = savedInstanceState.getBoolean(IS_SPEAKERPHONE_ON_KEY, false);

      isSpeakerphoneOn = savedInstanceState.getBoolean(IS_SPEAKERPHONE_ON_KEY, false);

      AudioManager audioManager = activity.getSystemService(AudioManager.class);

      audioManager.setSpeakerphoneOn(isSpeakerphoneOn);

    }

    }





    if (mediaPlayer == null) {

    if (mediaPlayer == null) {

java/com/android/dialer/calllog/config/CallLogConfigComponent.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.dialer.calllog.config; 




import android.content.Context;

import android.content.Context;

import com.android.dialer.inject.HasRootComponent;

import com.android.dialer.inject.HasRootComponent;

import com.android.dialer.inject.IncludeInDialerRoot;

import dagger.Subcomponent;

import dagger.Subcomponent;





/** Dagger component for the call log config. */

/** Dagger component for the call log config. */
@@ -31,6 +32,7 @@ public abstract class CallLogConfigComponent { 
  }

  }





  /** Used to refer to the root application component. */

  /** Used to refer to the root application component. */

  @IncludeInDialerRoot

  public interface HasComponent {

  public interface HasComponent {

    CallLogConfigComponent callLogConfigComponent();

    CallLogConfigComponent callLogConfigComponent();

  }

  }

java/com/android/dialer/duo/stub/StubDuoModule.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -17,11 +17,14 @@ 
package com.android.dialer.duo.stub;

package com.android.dialer.duo.stub;





import com.android.dialer.duo.Duo;

import com.android.dialer.duo.Duo;

import com.android.dialer.inject.DialerVariant;

import com.android.dialer.inject.InstallIn;

import dagger.Binds;

import dagger.Binds;

import dagger.Module;

import dagger.Module;

import javax.inject.Singleton;

import javax.inject.Singleton;





@Module

@Module

@InstallIn(variants = DialerVariant.DIALER_TEST)

public abstract class StubDuoModule {

public abstract class StubDuoModule {





  @Binds

  @Binds

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -424,7 +424,10 @@ public class MainSearchController implements SearchBarListener { 




    searchFragment.setQuery(

    searchFragment.setQuery(

        query.isPresent() ? query.get() : "", CallInitiationType.Type.REGULAR_SEARCH);

        query.isPresent() ? query.get() : "", CallInitiationType.Type.REGULAR_SEARCH);



    if (activity.isSafeToCommitTransactions()) {

      transaction.commit();

      transaction.commit();

    }





    notifyListenersOnSearchOpen();

    notifyListenersOnSearchOpen();

  }

  }