PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming Telecomm to Telecom.

Browse Source 
- 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: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
This commit is contained in:
Tyler Gunn
2014-09-10 15:21:33 -07:00
parent c64c9808b9
commit 3e71b197f7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/CryptKeeper.java
View File

@@ -38,7 +38,7 @@ import android.os.UserHandle;
import android.os.storage.IMountService; import android.os.storage.IMountService;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.provider.Settings; import android.provider.Settings;
import android.telecomm.TelecommManager; import android.telecom.TelecomManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
@@ -892,7 +892,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
} }
int textId; int textId;
if (getTelecommManager().isInCall()) { if (getTelecomManager().isInCall()) {
// Show "return to call" // Show "return to call"
textId = R.string.cryptkeeper_return_to_call; textId = R.string.cryptkeeper_return_to_call;
} else { } else {
@@ -906,9 +906,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
} }
private void takeEmergencyCallAction() { private void takeEmergencyCallAction() {
TelecommManager telecommManager = getTelecommManager(); TelecomManager telecomManager = getTelecomManager();
if (telecommManager.isInCall()) { if (telecomManager.isInCall()) {
telecommManager.showInCallScreen(false /* showDialpad */); telecomManager.showInCallScreen(false /* showDialpad */);
} else { } else {
launchEmergencyDialer(); launchEmergencyDialer();
} }
@@ -927,8 +927,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
} }
private TelecommManager getTelecommManager() { private TelecomManager getTelecomManager() {
return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE); return (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
} }
/** /**

2
src/com/android/settings/sim/SimSettings.java
View File

@@ -38,7 +38,7 @@ import android.preference.PreferenceScreen;
import android.telephony.SubInfoRecord; import android.telephony.SubInfoRecord;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.telecomm.PhoneAccount; import android.telecom.PhoneAccount;
import android.telephony.CellInfo; import android.telephony.CellInfo;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;