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

Commit 98804478 authored by erfanian's avatar erfanian Committed by Copybara-Service
Browse files

Link to the correct Assisted Dialing settings depending on platform version. 

Bug: 72162646
Test: unit tests
PiperOrigin-RevId: 183134859
Change-Id: I73d3349f0ff33188cfe0a121b7737a57155683c7
parent 571a2b4b

java/com/android/dialer/calldetails/CallDetailsActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.provider.CallLog.Calls; 
import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import android.support.annotation.RequiresPermission;

import android.support.v4.os.BuildCompat;

import android.support.v7.app.AppCompatActivity;

import android.support.v7.widget.LinearLayoutManager;

import android.support.v7.widget.RecyclerView;
@@ -52,6 +53,7 @@ import com.android.dialer.common.concurrent.DialerExecutor.FailureListener; 
import com.android.dialer.common.concurrent.DialerExecutor.SuccessListener;

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

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

import com.android.dialer.compat.telephony.TelephonyManagerCompat;

import com.android.dialer.constants.ActivityRequestCodes;

import com.android.dialer.dialercontact.DialerContact;

import com.android.dialer.duo.Duo;
@@ -407,9 +409,15 @@ public class CallDetailsActivity extends AppCompatActivity { 


    @Override

    public void openAssistedDialingSettings(View unused) {

      if (BuildCompat.isAtLeastP()) {

        Intent callSettingsIntent =

            new Intent(TelephonyManagerCompat.ACTION_SHOW_ASSISTED_DIALING_SETTINGS);

        getActivity().startActivity(callSettingsIntent);

      } else {

        Intent intent = new Intent(getActivity(), AssistedDialingSettingActivity.class);

        getActivity().startActivity(intent);

      }

    }



    @Override

    public void createAssistedDialerNumberParserTask(

java/com/android/dialer/compat/telephony/TelephonyManagerCompat.java

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ public class TelephonyManagerCompat { 
   */

  public static final Integer FEATURES_ASSISTED_DIALING = 1 << 4;



  /** The {@link android.content.Intent} action used to show the assisted dialing settings. */

  public static final String ACTION_SHOW_ASSISTED_DIALING_SETTINGS =

      "android.telecom.action.SHOW_ASSISTED_DIALING_SETTINGS";



  /**

   * Returns the number of phones available. Returns 1 for Single standby mode (Single SIM

   * functionality) Returns 2 for Dual standby mode.(Dual SIM functionality)