summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-21 23:30:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-21 23:30:29 +0000
commit49e9d61dcf30c041644232df0f3e5f8c89e5821c (patch)
treee34d2e843c31b5261acc18183d91d74c5701ab53
parente7b4890ce27ef83a2688b9a1de40b3cd385700ea (diff)
parent11dc926a04a20560240a440875d5d649cfc9bb70 (diff)
am 11dc926a: am 18c7724f: am 80c81b11: Merge "Expose call settings as public API (3/3)" into lmp-dev
* commit '11dc926a04a20560240a440875d5d649cfc9bb70': Expose call settings as public API (3/3)
-rw-r--r--src/com/android/dialer/DialtactsActivity.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index a19964b60..bf2af138a 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -36,6 +36,7 @@ import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents;
import android.speech.RecognizerIntent;
import android.support.v4.view.ViewPager;
+import android.telecomm.TelecommManager;
import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.TextUtils;
@@ -114,10 +115,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O
public static final String SHARED_PREFS_NAME = "com.android.dialer_preferences";
- /** Used to open Call Setting */
- private static final String PHONE_PACKAGE = "com.android.phone";
- private static final String CALL_SETTINGS_CLASS_NAME =
- "com.android.phone.CallFeaturesSetting";
/** @see #getCallOrigin() */
private static final String CALL_ORIGIN_DIALTACTS =
"com.android.dialer.DialtactsActivity";
@@ -926,8 +923,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(Intent.ACTION_MAIN);
- intent.setClassName(PHONE_PACKAGE, CALL_SETTINGS_CLASS_NAME);
+ final Intent intent = new Intent(TelecommManager.ACTION_SHOW_CALL_SETTINGS);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
return intent;
}