Merge "Send broadcast when default dialer changes" into mnc-dev

This commit is contained in:
Yorke Lee
2015-06-16 19:30:13 +00:00
committed by Android (Google) Code Review

View File

@@ -19,6 +19,7 @@ package com.android.settings.applications;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.telecom.DefaultDialerManager; import android.telecom.DefaultDialerManager;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -29,10 +30,12 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
public class DefaultPhonePreference extends AppListPreference { public class DefaultPhonePreference extends AppListPreference {
private final Context mContext;
public DefaultPhonePreference(Context context, AttributeSet attrs) { public DefaultPhonePreference(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
mContext = context.getApplicationContext();
if (isAvailable(context)) { if (isAvailable(context)) {
loadDialerApps(); loadDialerApps();
} }
@@ -41,7 +44,7 @@ public class DefaultPhonePreference extends AppListPreference {
@Override @Override
protected boolean persistString(String value) { protected boolean persistString(String value) {
if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) { if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
DefaultDialerManager.setDefaultDialerApplication(getContext(), value); TelecomManager.from(mContext).setDefaultDialer(value);
} }
setSummary(getEntry()); setSummary(getEntry());
return true; return true;