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

Commit 8e1eddf0 authored by weijiaxu's avatar weijiaxu Committed by Copybara-Service
Browse files

Refactoring simulator portal and related files. 

Delete simulator/portal package and move all files to simulator/impl package.

Bug: 79488174
Test: presubmit test.
PiperOrigin-RevId: 196735123
Change-Id: I2f578ca0912552ee32104d9ee5088bbb34ce5123
parent fa863bed

java/com/android/dialer/simulator/impl/RttChatBot.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Random; 


/** Chat bot to generate remote RTT chat messages. */

@TargetApi(28)

public class RttChatBot {

class RttChatBot {



  interface Callback {

    void type(String text);
@@ -62,14 +62,14 @@ public class RttChatBot { 
  }



  @MainThread

  public void start() {

  void start() {

    Assert.isMainThread();

    LogUtil.enterBlock("RttChatBot.start");

    messageHandler.sendEmptyMessage(START_SENDING);

  }



  @MainThread

  public void stop() {

  void stop() {

    Assert.isMainThread();

    LogUtil.enterBlock("RttChatBot.stop");

    if (handlerThread != null && handlerThread.isAlive()) {

java/com/android/dialer/simulator/impl/SimulatorConferenceCreator.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.ArrayList; 
import java.util.Locale;



/** Creates a conference with a given number of participants. */

public final class SimulatorConferenceCreator

final class SimulatorConferenceCreator

    implements SimulatorConnectionService.Listener,

        SimulatorConnection.Listener,

        SimulatorConference.Listener {
@@ -46,7 +46,7 @@ public final class SimulatorConferenceCreator 


  @Simulator.ConferenceType private final int conferenceType;



  public SimulatorConferenceCreator(

  SimulatorConferenceCreator(

      @NonNull Context context, @Simulator.ConferenceType int conferenceType) {

    this.context = Assert.isNotNull(context);

    this.conferenceType = conferenceType;
@@ -58,7 +58,7 @@ public final class SimulatorConferenceCreator 
   *

   * @param callCount the number of calls in conference to create.

   */

  public void start(int callCount) {

  void start(int callCount) {

    onNewIncomingConnectionEnabled = true;

    SimulatorConnectionService.addListener(this);

    if (conferenceType == Simulator.CONFERENCE_TYPE_VOLTE) {

java/com/android/dialer/simulator/impl/SimulatorImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.dialer.buildtype.BuildType; 
import com.android.dialer.buildtype.BuildType.Type;

import com.android.dialer.common.LogUtil;

import com.android.dialer.simulator.Simulator;

import com.android.dialer.simulator.portal.SimulatorMainPortal;

import javax.inject.Inject;



/** The entry point for the simulator feature. */

java/com/android/dialer/simulator/portal/SimulatorMainPortal.java→java/com/android/dialer/simulator/impl/SimulatorMainPortal.java

+1 −8
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.dialer.simulator.portal;

package com.android.dialer.simulator.impl;



import android.content.Context;

import android.support.v7.app.AppCompatActivity;
@@ -23,13 +23,6 @@ import android.view.ActionProvider; 
import com.android.dialer.enrichedcall.simulator.EnrichedCallSimulatorActivity;

import com.android.dialer.simulator.Simulator;

import com.android.dialer.simulator.SimulatorComponent;

import com.android.dialer.simulator.impl.SimulatorConferenceCreator;

import com.android.dialer.simulator.impl.SimulatorMissedCallCreator;

import com.android.dialer.simulator.impl.SimulatorRttCall;

import com.android.dialer.simulator.impl.SimulatorSimCallManager;

import com.android.dialer.simulator.impl.SimulatorUtils;

import com.android.dialer.simulator.impl.SimulatorVideoCall;

import com.android.dialer.simulator.impl.SimulatorVoiceCall;

import com.google.common.collect.ImmutableMap;



/** Implements the top level simulator menu. */

java/com/android/dialer/simulator/portal/SimulatorMenu.java→java/com/android/dialer/simulator/impl/SimulatorMenu.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License

 */



package com.android.dialer.simulator.portal;

package com.android.dialer.simulator.impl;



import android.content.Context;

import android.support.annotation.NonNull;