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: Ic33bafd37200e65431543a9889aed549dbb04831
diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index a25b7a9..3af4d7d 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -22,9 +22,7 @@
import com.android.internal.telephony.TelephonyCapabilities;
import com.android.phone.CallGatewayManager.RawGatewayInfo;
import com.android.phone.Constants.CallStatusCode;
-import com.android.phone.ErrorDialogActivity;
-import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Intent;
import android.net.Uri;
@@ -32,7 +30,7 @@
import android.os.Message;
import android.os.SystemProperties;
import android.provider.CallLog.Calls;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.telephony.ServiceState;
import android.util.Log;
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index bb23292..6947727 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -48,8 +48,8 @@
import android.preference.PreferenceScreen;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.Settings;
-import android.telecomm.PhoneAccountHandle;
-import android.telecomm.TelecommManager;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
@@ -597,12 +597,12 @@
@Override
public boolean onAccountSelected(AccountSelectionPreference pref, PhoneAccountHandle account) {
- TelecommManager telecommManager = TelecommManager.from(this);
+ TelecomManager telecomManager = TelecomManager.from(this);
if (pref == mDefaultOutgoingAccount) {
- telecommManager.setUserSelectedOutgoingPhoneAccount(account);
+ telecomManager.setUserSelectedOutgoingPhoneAccount(account);
return true;
} else if (pref == mSimCallManagerAccount) {
- telecommManager.setSimCallManager(account);
+ telecomManager.setSimCallManager(account);
return true;
}
return false;
@@ -865,7 +865,8 @@
saveVoiceMailAndForwardingNumber(
getCurrentVoicemailProviderKey(),
new VoiceMailProviderSettings(mSubMenuVoicemailSettings.getPhoneNumber(),
- FWD_SETTINGS_DONT_TOUCH));
+ FWD_SETTINGS_DONT_TOUCH)
+ );
}
@@ -1570,9 +1571,9 @@
mSimCallManagerAccount = (AccountSelectionPreference)
findPreference(WIFI_CALL_MANAGER_ACCOUNT_KEY);
- TelecommManager telecommManager = TelecommManager.from(this);
+ TelecomManager telecomManager = TelecomManager.from(this);
- int allPhoneAccountsCount = telecommManager.getAllPhoneAccountsCount();
+ int allPhoneAccountsCount = telecomManager.getAllPhoneAccountsCount();
// Show the phone accounts preference if there are is more than one phone account (this
// includes disabled phone accounts). The default selection, however, only includes those
// PhoneAccounts which are enabled.
@@ -1584,7 +1585,7 @@
getPreferenceScreen().removePreference(mDefaultOutgoingAccount);
}
- List<PhoneAccountHandle> simCallManagers = telecommManager.getSimCallManagers();
+ List<PhoneAccountHandle> simCallManagers = telecomManager.getSimCallManagers();
if (!simCallManagers.isEmpty()) {
populateSimCallManagerAccountsModel();
mSimCallManagerAccount.setListener(this);
@@ -1700,8 +1701,8 @@
}
if (mButtonTTY != null) {
- TelecommManager telecommManager = TelecommManager.from(this);
- if (telecommManager != null && telecommManager.isTtySupported()) {
+ TelecomManager telecomManager = TelecomManager.from(this);
+ if (telecomManager != null && telecomManager.isTtySupported()) {
mButtonTTY.setOnPreferenceChangeListener(this);
} else {
prefSet.removePreference(mButtonTTY);
@@ -1791,7 +1792,7 @@
if (mButtonTTY != null) {
int settingsTtyMode = Settings.Secure.getInt(getContentResolver(),
Settings.Secure.PREFERRED_TTY_MODE,
- TelecommManager.TTY_MODE_OFF);
+ TelecomManager.TTY_MODE_OFF);
mButtonTTY.setValue(Integer.toString(settingsTtyMode));
updatePreferredTtyModeSummary(settingsTtyMode);
}
@@ -1837,27 +1838,27 @@
int settingsTtyMode = android.provider.Settings.Secure.getInt(
getContentResolver(),
android.provider.Settings.Secure.PREFERRED_TTY_MODE,
- TelecommManager.TTY_MODE_OFF);
+ TelecomManager.TTY_MODE_OFF);
if (DBG) log("handleTTYChange: requesting set TTY mode enable (TTY) to" +
Integer.toString(buttonTtyMode));
if (buttonTtyMode != settingsTtyMode) {
switch(buttonTtyMode) {
- case TelecommManager.TTY_MODE_OFF:
- case TelecommManager.TTY_MODE_FULL:
- case TelecommManager.TTY_MODE_HCO:
- case TelecommManager.TTY_MODE_VCO:
+ case TelecomManager.TTY_MODE_OFF:
+ case TelecomManager.TTY_MODE_FULL:
+ case TelecomManager.TTY_MODE_HCO:
+ case TelecomManager.TTY_MODE_VCO:
android.provider.Settings.Secure.putInt(getContentResolver(),
android.provider.Settings.Secure.PREFERRED_TTY_MODE, buttonTtyMode);
break;
default:
- buttonTtyMode = TelecommManager.TTY_MODE_OFF;
+ buttonTtyMode = TelecomManager.TTY_MODE_OFF;
}
mButtonTTY.setValue(Integer.toString(buttonTtyMode));
updatePreferredTtyModeSummary(buttonTtyMode);
- Intent ttyModeChanged = new Intent(TelecommManager.ACTION_TTY_PREFERRED_MODE_CHANGED);
- ttyModeChanged.putExtra(TelecommManager.EXTRA_TTY_PREFERRED_MODE, buttonTtyMode);
+ Intent ttyModeChanged = new Intent(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);
+ ttyModeChanged.putExtra(TelecomManager.EXTRA_TTY_PREFERRED_MODE, buttonTtyMode);
sendBroadcastAsUser(ttyModeChanged, UserHandle.ALL);
}
}
@@ -1882,15 +1883,15 @@
private void updatePreferredTtyModeSummary(int TtyMode) {
String [] txts = getResources().getStringArray(R.array.tty_mode_entries);
switch(TtyMode) {
- case TelecommManager.TTY_MODE_OFF:
- case TelecommManager.TTY_MODE_HCO:
- case TelecommManager.TTY_MODE_VCO:
- case TelecommManager.TTY_MODE_FULL:
+ case TelecomManager.TTY_MODE_OFF:
+ case TelecomManager.TTY_MODE_HCO:
+ case TelecomManager.TTY_MODE_VCO:
+ case TelecomManager.TTY_MODE_FULL:
mButtonTTY.setSummary(txts[TtyMode]);
break;
default:
mButtonTTY.setEnabled(false);
- mButtonTTY.setSummary(txts[TelecommManager.TTY_MODE_OFF]);
+ mButtonTTY.setSummary(txts[TelecomManager.TTY_MODE_OFF]);
break;
}
}
@@ -2147,12 +2148,12 @@
return;
}
- TelecommManager telecommManager = TelecommManager.from(this);
- List<PhoneAccountHandle> enabledPhoneAccounts = telecommManager.getEnabledPhoneAccounts();
+ TelecomManager telecomManager = TelecomManager.from(this);
+ List<PhoneAccountHandle> enabledPhoneAccounts = telecomManager.getEnabledPhoneAccounts();
mDefaultOutgoingAccount.setModel(
- telecommManager,
+ telecomManager,
enabledPhoneAccounts,
- telecommManager.getUserSelectedOutgoingPhoneAccount(),
+ telecomManager.getUserSelectedOutgoingPhoneAccount(),
getString(R.string.phone_accounts_ask_every_time));
}
@@ -2165,12 +2166,12 @@
return;
}
- TelecommManager telecommManager = TelecommManager.from(this);
- List<PhoneAccountHandle> simCallManagers = telecommManager.getSimCallManagers();
+ TelecomManager telecomManager = TelecomManager.from(this);
+ List<PhoneAccountHandle> simCallManagers = telecomManager.getSimCallManagers();
mSimCallManagerAccount.setModel(
- telecommManager,
+ telecomManager,
simCallManagers,
- telecommManager.getSimCallManager(),
+ telecomManager.getSimCallManager(),
getString(R.string.wifi_calling_do_not_use));
}
diff --git a/src/com/android/phone/CallGatewayManager.java b/src/com/android/phone/CallGatewayManager.java
index a349d17..bdac983 100644
--- a/src/com/android/phone/CallGatewayManager.java
+++ b/src/com/android/phone/CallGatewayManager.java
@@ -18,13 +18,12 @@
import android.content.Intent;
import android.net.Uri;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.telephony.Connection;
-import com.google.android.collect.Maps;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 1a64166..d373b60 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -254,7 +254,7 @@
break;
case CallStateMonitor.PHONE_RINGBACK_TONE:
- // DISABLED. The Telecomm and new ConnectionService layers are now responsible.
+ // DISABLED. The Telecom and new ConnectionService layers are now responsible.
// onRingbackTone((AsyncResult) msg.obj);
break;
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index ca42f2a..e29d4c8 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -30,7 +30,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.text.Editable;
import android.text.TextUtils;
@@ -38,7 +38,6 @@
import android.text.method.DialerKeyListener;
import android.util.Log;
import android.view.KeyEvent;
-import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityManager;
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 668038c..feccf95 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -20,43 +20,24 @@
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.StatusBarManager;
-import android.content.AsyncQueryHandler;
import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.ContentUris;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
import android.net.Uri;
-import android.os.PowerManager;
import android.os.SystemProperties;
import android.preference.PreferenceManager;
-import android.provider.CallLog.Calls;
-import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.PhoneLookup;
import android.provider.Settings;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.telephony.ServiceState;
-import android.text.BidiFormatter;
-import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
import android.util.Log;
import android.widget.Toast;
-import com.android.internal.telephony.Call;
-import com.android.internal.telephony.CallManager;
-import com.android.internal.telephony.CallerInfo;
-import com.android.internal.telephony.CallerInfoAsyncQuery;
-import com.android.internal.telephony.Connection;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneBase;
-import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyCapabilities;
/**
diff --git a/src/com/android/phone/OtaUtils.java b/src/com/android/phone/OtaUtils.java
index 4a9154f..5f8b2c7 100644
--- a/src/com/android/phone/OtaUtils.java
+++ b/src/com/android/phone/OtaUtils.java
@@ -37,17 +37,15 @@
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.TelephonyManager;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
-import android.view.ViewStub;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.ToggleButton;
diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index 0f47c12..be95103 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -28,21 +28,19 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.net.Uri;
-import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.UserHandle;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ProgressBar;
-import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyCapabilities;
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index c034d8b..fa3d18b 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -28,13 +28,12 @@
import android.content.res.Configuration;
import android.media.AudioManager;
import android.net.Uri;
-import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import android.os.SystemProperties;
-import android.telecomm.PhoneAccount;
-import android.telecomm.VideoProfile;
+import android.telecom.PhoneAccount;
+import android.telecom.VideoProfile;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
@@ -59,10 +58,7 @@
import com.android.internal.telephony.sip.SipPhone;
import com.android.phone.CallGatewayManager.RawGatewayInfo;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
/**
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index cc2b992..a069e41 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -38,7 +38,7 @@
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.RawContacts;
-import android.telecomm.PhoneAccount;
+import android.telecom.PhoneAccount;
import android.text.TextUtils;
import android.util.Log;
import android.view.ContextMenu;
diff --git a/src/com/android/phone/settings/AccountSelectionPreference.java b/src/com/android/phone/settings/AccountSelectionPreference.java
index 8469a18..88a12e7 100644
--- a/src/com/android/phone/settings/AccountSelectionPreference.java
+++ b/src/com/android/phone/settings/AccountSelectionPreference.java
@@ -25,8 +25,8 @@
import android.os.UserHandle;
import android.preference.ListPreference;
import android.preference.Preference;
-import android.telecomm.PhoneAccountHandle;
-import android.telecomm.TelecommManager;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import android.util.AttributeSet;
import java.util.List;
@@ -63,7 +63,7 @@
}
public void setModel(
- TelecommManager telecommManager,
+ TelecomManager telecomManager,
List<PhoneAccountHandle> accountsList,
PhoneAccountHandle currentSelection,
CharSequence nullSelectionString) {
@@ -75,7 +75,7 @@
int selectedIndex = mAccounts.length; // Points to nullSelectionString by default
int i = 0;
for ( ; i < mAccounts.length; i++) {
- CharSequence label = telecommManager.getPhoneAccount(mAccounts[i]).getLabel();
+ CharSequence label = telecomManager.getPhoneAccount(mAccounts[i]).getLabel();
mEntries[i] = label == null ? null : label.toString();
mEntryValues[i] = Integer.toString(i);
if (Objects.equals(currentSelection, mAccounts[i])) {
diff --git a/src/com/android/phone/settings/PhoneAccountSelectionPreferenceActivity.java b/src/com/android/phone/settings/PhoneAccountSelectionPreferenceActivity.java
index 7dd1190..a5eadbb 100644
--- a/src/com/android/phone/settings/PhoneAccountSelectionPreferenceActivity.java
+++ b/src/com/android/phone/settings/PhoneAccountSelectionPreferenceActivity.java
@@ -25,9 +25,9 @@
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.SwitchPreference;
-import android.telecomm.PhoneAccount;
-import android.telecomm.PhoneAccountHandle;
-import android.telecomm.TelecommManager;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
import com.android.internal.util.CharSequences;
import com.android.phone.R;
@@ -49,7 +49,7 @@
implements Preference.OnPreferenceChangeListener {
private static final String CATEGORY_PHONE_ACCOUNTS_KEY = "phone_accounts_list";
- private TelecommManager mTelecommManager;
+ private TelecomManager mTelecomManager;
private PreferenceCategory mPhoneAccountsCategory;
/**
@@ -93,9 +93,9 @@
addPreferencesFromResource(R.xml.phone_account_selection);
mPhoneAccountsCategory = (PreferenceCategory) findPreference(
CATEGORY_PHONE_ACCOUNTS_KEY);
- mTelecommManager = TelecommManager.from(this.getActivity());
+ mTelecomManager = TelecomManager.from(this.getActivity());
- List<PhoneAccount> phoneAccounts = mTelecommManager.getAllPhoneAccounts();
+ List<PhoneAccount> phoneAccounts = mTelecomManager.getAllPhoneAccounts();
Collections.sort(phoneAccounts, new Comparator<PhoneAccount>() {
@Override
public int compare(PhoneAccount o1, PhoneAccount o2) {
@@ -131,7 +131,7 @@
boolean newState = Boolean.valueOf(newValue.toString()).booleanValue();
if (newState != phoneAccountPreference.getPreviousState()) {
- mTelecommManager.setPhoneAccountEnabled(
+ mTelecomManager.setPhoneAccountEnabled(
phoneAccountPreference.getPhoneAccountHandle(), newState);
}
return true;