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

Merge "Use AssistUtils.getAssistInfo" into mnc-dev

Browse Source
This commit is contained in:
Adrian Roos
2015-06-15 23:49:17 +00:00
committed by Android (Google) Code Review
parent be1b22e88e b627370e85
commit bada978ec3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/applications/DefaultAssistPreference.java
View File

@@ -21,15 +21,15 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.voice.VoiceInteractionService;
import android.service.voice.VoiceInteractionServiceInfo;
import android.speech.RecognitionService;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import com.android.internal.app.AssistUtils;
import com.android.settings.AppListPreferenceWithSettings;
import com.android.settings.R;
@@ -42,10 +42,13 @@ public class DefaultAssistPreference extends AppListPreferenceWithSettings {
private final List<Info> mAvailableAssistants = new ArrayList<>();
private final AssistUtils mAssistUtils;
public DefaultAssistPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setShowItemNone(true);
setDialogTitle(R.string.choose_assist_title);
mAssistUtils = new AssistUtils(context);
}
@Override
@@ -169,9 +172,7 @@ public class DefaultAssistPreference extends AppListPreferenceWithSettings {
}
public ComponentName getCurrentAssist() {
String currentSetting = Settings.Secure.getString(getContext().getContentResolver(),
Settings.Secure.ASSISTANT);
return currentSetting == null ? null : ComponentName.unflattenFromString(currentSetting);
return mAssistUtils.getAssistComponentForUser(UserHandle.myUserId());
}
public void refreshAssistApps() {