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

Commit 9dc924c8 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Renaming Telecomm to Telecom. 

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I44d6d6546cac53232e4e2be0ebe0391d02411309
parent bd97cd04

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ 
                 android:process="com.android.incallui"

                 android:permission="android.permission.BIND_INCALL_SERVICE" >

            <intent-filter>

                <action android:name="android.telecomm.InCallService"/>

                <action android:name="android.telecom.InCallService"/>

            </intent-filter>

        </service>

    </application>

res/xml/general_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 


            <intent

                android:action="android.intent.action.MAIN"

                android:targetPackage="com.android.telecomm"

                android:targetClass="com.android.telecomm.RespondViaSmsSettings$Settings" />

                android:targetPackage="com.android.server.telecom"

                android:targetClass="com.android.server.telecom.RespondViaSmsSettings$Settings" />



        </PreferenceScreen>

src/com/android/dialer/CallDetailActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.dialer;



import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.ContentValues;
@@ -24,17 +23,14 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;

import android.provider.CallLog;

import android.provider.CallLog.Calls;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.VoicemailContract;

import android.provider.VoicemailContract.Voicemails;

import android.telecomm.PhoneAccount;

import android.telecomm.TelecommManager;

import android.telecom.PhoneAccount;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;
@@ -54,7 +50,6 @@ import com.android.contacts.common.CallUtil; 
import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;

import com.android.contacts.common.GeoUtil;

import com.android.dialer.calllog.CallDetailHistoryAdapter;

import com.android.dialer.calllog.CallLogQuery;

import com.android.dialer.calllog.CallTypeHelper;

import com.android.dialer.calllog.ContactInfo;

import com.android.dialer.calllog.ContactInfoHelper;

src/com/android/dialer/DialtactsActivity.java

+7 −8
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import android.provider.ContactsContract.Contacts; 
import android.provider.ContactsContract.Intents;

import android.speech.RecognizerIntent;

import android.support.v4.view.ViewPager;

import android.telecomm.PhoneAccount;

import android.telecomm.TelecommManager;

import android.telecom.PhoneAccount;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.text.Editable;

import android.text.TextUtils;
@@ -92,7 +92,6 @@ import com.android.phone.common.animation.AnimationListenerAdapter; 


import java.util.ArrayList;

import java.util.List;

import java.util.Locale;



/**

 * The dialer tab's title is 'phone', a more common name (see strings.xml).
@@ -774,7 +773,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
        final boolean callKey = Intent.ACTION_CALL_BUTTON.equals(intent.getAction());



        if (callKey) {

            getTelecommManager().showInCallScreen(false);

            getTelecomManager().showInCallScreen(false);

            return true;

        }
@@ -918,7 +917,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 


    /** Returns an Intent to launch Call Settings screen */

    public static Intent getCallSettingsIntent() {

        final Intent intent = new Intent(TelecommManager.ACTION_SHOW_CALL_SETTINGS);

        final Intent intent = new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS);

        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

        return intent;

    }
@@ -995,7 +994,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
    }



    private boolean phoneIsInUse() {

        return getTelecommManager().isInCall();

        return getTelecomManager().isInCall();

    }



    public static Intent getAddNumberToContactIntent(CharSequence text) {
@@ -1127,8 +1126,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O 
        return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

    }



    private TelecommManager getTelecommManager() {

        return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE);

    private TelecomManager getTelecomManager() {

        return (TelecomManager) getSystemService(Context.TELECOM_SERVICE);

    }



    @Override

src/com/android/dialer/SpecialCharSequenceMgr.java

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.database.Cursor; 
import android.net.Uri;

import android.os.Looper;

import android.provider.Settings;

import android.telecomm.TelecommManager;

import android.telecom.TelecomManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.TelephonyManager;

import android.util.Log;
@@ -226,9 +226,9 @@ public class SpecialCharSequenceMgr { 


    static boolean handlePinEntry(Context context, String input) {

        if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {

            TelecommManager telecommManager =

                    (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE);

            return telecommManager.handleMmi(input);

            TelecomManager telecomManager =

                    (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);

            return telecomManager.handleMmi(input);

        }

        return false;

    }