Merge "Default apps setting for managed profile"

This commit is contained in:
Tony Mak
2016-01-27 17:17:44 +00:00
committed by Android (Google) Code Review
8 changed files with 146 additions and 67 deletions

View File

@@ -18,9 +18,11 @@ package com.android.settings.applications;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserManager;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
@@ -28,6 +30,7 @@ import android.support.v7.preference.Preference;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.voice.VoiceInputListPreference;
/**
@@ -175,4 +178,8 @@ public class ManageAssist extends SettingsPreferenceFragment
mDefaultAssitPref.setValue(assistPackage);
updateUi();
}
public static boolean isAvailable(Context context) {
return !Utils.isManagedProfile(UserManager.get(context));
}
}