Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

speech: Add on-device speech recognition settings entry

Browse Source 
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
This commit is contained in:
Aleksandar Kiridzic
2022-06-09 13:54:59 +01:00
committed by Aleksandar Kiridžić
parent 652e9ef651
commit 31473663f5
5 changed files with 276 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/com/android/settings/language/OnDeviceRecognitionPreferenceController.java Normal file
View File

@@ -0,0 +1,133 @@
/*
* Copyright (C) 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.language;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.internal.R;
import com.android.settings.core.BasePreferenceController;
import java.util.ArrayList;
import java.util.Optional;
/** Controller of the On-device recognition preference. */
public class OnDeviceRecognitionPreferenceController extends BasePreferenceController {
private static final String TAG = "OnDeviceRecognitionPreferenceController";
private Optional<Intent> mIntent;
public OnDeviceRecognitionPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
if (mIntent == null) {
mIntent = Optional.ofNullable(onDeviceRecognitionIntent());
}
return mIntent.isPresent()
? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@Override
public void updateState(Preference preference) {
super.updateState(preference);
if (mIntent != null && mIntent.isPresent()) {
preference.setIntent(mIntent.get());
}
}
/**
* Create an {@link Intent} for the activity in the default on-device recognizer service if
* there is a properly defined speech recognition xml meta-data for that service.
*
* @return {@link Intent} if the proper activity is fount, {@code null} otherwise.
*/
@Nullable
private Intent onDeviceRecognitionIntent() {
final String resString = mContext.getString(
R.string.config_defaultOnDeviceSpeechRecognitionService);
if (resString == null) {
Log.v(TAG, "No on-device recognizer, intent not created.");
return null;
}
final ComponentName defaultOnDeviceRecognizerComponentName =
ComponentName.unflattenFromString(resString);
if (defaultOnDeviceRecognizerComponentName == null) {
Log.v(TAG, "Invalid on-device recognizer string format, intent not created.");
return null;
}
final ArrayList<VoiceInputHelper.RecognizerInfo> validRecognitionServices =
VoiceInputHelper.validRecognitionServices(mContext);
if (validRecognitionServices.isEmpty()) {
Log.v(TAG, "No speech recognition services"
+ "with proper `recognition-service` meta-data found.");
return null;
}
// Filter the recognizer services which are in the same package as the default on-device
// speech recognizer and have a settings activity defined in the meta-data.
final ArrayList<VoiceInputHelper.RecognizerInfo> validOnDeviceRecognitionServices =
new ArrayList<>();
for (VoiceInputHelper.RecognizerInfo recognizerInfo: validRecognitionServices) {
if (!defaultOnDeviceRecognizerComponentName.getPackageName().equals(
recognizerInfo.mService.packageName)) {
Log.v(TAG, String.format("Recognition service not in the same package as the "
+ "default on-device recognizer: %s.",
recognizerInfo.mComponentName.flattenToString()));
} else if (recognizerInfo.mSettings == null) {
Log.v(TAG, String.format("Recognition service with no settings activity: %s.",
recognizerInfo.mComponentName.flattenToString()));
} else {
validOnDeviceRecognitionServices.add(recognizerInfo);
Log.v(TAG, String.format("Recognition service in the same package as the default "
+ "on-device recognizer with settings activity: %s.",
recognizerInfo.mSettings.flattenToString()));
}
}
if (validOnDeviceRecognitionServices.isEmpty()) {
Log.v(TAG, "No speech recognition services with proper `recognition-service` "
+ "meta-data found in the same package as the default on-device recognizer.");
return null;
}
// Not more than one proper recognition services should be found in the same
// package as the default on-device recognizer. If that happens,
// the first one which passed the filter will be selected.
if (validOnDeviceRecognitionServices.size() > 1) {
Log.w(TAG, "More than one recognition services with proper `recognition-service` "
+ "meta-data found in the same package as the default on-device recognizer.");
}
VoiceInputHelper.RecognizerInfo chosenRecognizer = validOnDeviceRecognitionServices.get(0);
return new Intent(Intent.ACTION_MAIN).setComponent(chosenRecognizer.mSettings);
}
}