Rearrange configure/default apps
Bug: 27276982 Bug: 27279305 Change-Id: I443e9d2bc0c3fd9bcc13ee86716c14fbb55af0ba
This commit is contained in:
@@ -19,19 +19,16 @@ package com.android.settings.applications;
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
import android.telecom.DefaultDialerManager;
|
||||
import android.telecom.TelecomManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.text.TextUtils;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import com.android.settings.AppListPreference;
|
||||
import com.android.settings.PreferenceAvailabilityProvider;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.SelfAvailablePreference;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class DefaultPhonePreference extends AppListPreference {
|
||||
public class DefaultPhonePreference extends AppListPreference implements SelfAvailablePreference {
|
||||
private final Context mContext;
|
||||
|
||||
public DefaultPhonePreference(Context context, AttributeSet attrs) {
|
||||
@@ -44,7 +41,7 @@ public class DefaultPhonePreference extends AppListPreference {
|
||||
@Override
|
||||
protected boolean persistString(String value) {
|
||||
if (!TextUtils.isEmpty(value) && !Objects.equals(value, getDefaultPackage())) {
|
||||
TelecomManager.from(mContext).setDefaultDialer(value);
|
||||
DefaultDialerManager.setDefaultDialerApplication(getContext(), value, mUserId);
|
||||
}
|
||||
setSummary(getEntry());
|
||||
return true;
|
||||
@@ -52,7 +49,7 @@ public class DefaultPhonePreference extends AppListPreference {
|
||||
|
||||
private void loadDialerApps() {
|
||||
List<String> dialerPackages =
|
||||
DefaultDialerManager.getInstalledDialerApplications(getContext());
|
||||
DefaultDialerManager.getInstalledDialerApplications(getContext(), mUserId);
|
||||
|
||||
final String[] dialers = new String[dialerPackages.size()];
|
||||
for (int i = 0; i < dialerPackages.size(); i++) {
|
||||
@@ -62,22 +59,19 @@ public class DefaultPhonePreference extends AppListPreference {
|
||||
}
|
||||
|
||||
private String getDefaultPackage() {
|
||||
return DefaultDialerManager.getDefaultDialerApplication(getContext());
|
||||
return DefaultDialerManager.getDefaultDialerApplication(getContext(), mUserId);
|
||||
}
|
||||
|
||||
public static class AvailabilityProvider implements PreferenceAvailabilityProvider {
|
||||
@Override
|
||||
public boolean isAvailable(Context context) {
|
||||
|
||||
final TelephonyManager tm =
|
||||
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
if (!tm.isVoiceCapable()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final UserManager um =
|
||||
(UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
|
||||
@Override
|
||||
public boolean isAvailable(Context context) {
|
||||
final TelephonyManager tm =
|
||||
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
if (!tm.isVoiceCapable()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final UserManager um =
|
||||
(UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
return !um.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user