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

Integrate UI with APIs for physical keyboard settgins.

Browse Source 
Integrate UI with these APIs.
1. getKeyboardLayoutListForInputDevice
2. getKeyboardLayoutForInputDevice
3. setKeyboardLayoutForInputDevice

Demo: go/pk_with_final_api_demo

Bug: 247079681
Test: local test

Change-Id: I5478e2c344a47e692e7c524f8c1e96d9dda52796
This commit is contained in:
danielwbhuang
2022-12-29 20:28:44 +08:00
parent 9a1247e58f
commit f43c358b50
8 changed files with 289 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java
View File

@@ -20,64 +20,124 @@ import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputDeviceIdentifier;
import android.hardware.input.InputManager;
import android.hardware.input.KeyboardLayout;
import android.os.Bundle;
import android.os.UserHandle;
import android.view.InputDevice;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.inputmethod.NewKeyboardSettingsUtils.KeyboardInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
implements InputManager.InputDeviceListener {
private static final String TAG = "NewKeyboardLayoutEnabledLocalesFragment";
private static final String PREF_KEY_ENABLED_LOCALES = "enabled_locales_keyboard_layout";
static final String EXTRA_KEYBOARD_DEVICE_NAME = "extra_keyboard_device_name";
private InputManager mIm;
private InputMethodManager mImm;
private InputDeviceIdentifier mInputDeviceIdentifier;
private int mUserId;
private int mInputDeviceId;
private Context mContext;
private Map<String, KeyboardInfo> mKeyboardLanguageLayouts = new HashMap<>();
@Override
public void onActivityCreated(final Bundle icicle) {
super.onActivityCreated(icicle);
Bundle arguments = getArguments();
final String title = arguments.getString(EXTRA_KEYBOARD_DEVICE_NAME);
mInputDeviceIdentifier = arguments.getParcelable(
KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER);
final String title =
arguments.getString(NewKeyboardSettingsUtils.EXTRA_KEYBOARD_DEVICE_NAME);
mInputDeviceIdentifier =
arguments.getParcelable(NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER);
getActivity().setTitle(title);
final PreferenceCategory category = findPreference(PREF_KEY_ENABLED_LOCALES);
updateCheckedState();
}
// TODO(b/252816846): Need APIs to get the available keyboards from Inputmanager.
// For example: InputMethodManager.getEnabledInputMethodLocales()
// InputManager.getKeyboardLayoutForLocale()
// Hardcode the default value for demo purpose
String[] keyboardLanguages = {"English (US)", "German (Germany)", "Spanish (Spain)"};
String[] keyboardLayouts = {"English (US)", "German", "Spanish"};
for (int i = 0; i < keyboardLanguages.length; i++) {
private void updateCheckedState() {
PreferenceScreen preferenceScreen = getPreferenceScreen();
preferenceScreen.removeAll();
List<InputMethodInfo> infoList = mImm.getEnabledInputMethodListAsUser(mUserId);
for (InputMethodInfo info : infoList) {
mKeyboardLanguageLayouts.clear();
List<InputMethodSubtype> subtypes =
mImm.getEnabledInputMethodSubtypeList(info, true);
for (InputMethodSubtype subtype : subtypes) {
if (subtype.isSuitableForPhysicalKeyboardLayoutMapping()) {
mapLanguageWithLayout(info, subtype);
}
}
updatePreferenceLayout(preferenceScreen, info);
}
}
private void mapLanguageWithLayout(InputMethodInfo info, InputMethodSubtype subtype) {
KeyboardLayout[] keyboardLayouts = getKeyboardLayouts(info, subtype);
String layout = getKeyboardLayout(info, subtype);
String language = getLanguage(info, subtype);
if (layout != null) {
for (int i = 0; i < keyboardLayouts.length; i++) {
if (keyboardLayouts[i].getDescriptor().equals(layout)) {
KeyboardInfo keyboardInfo = new KeyboardInfo(
language,
keyboardLayouts[i].getLabel(),
info,
subtype);
mKeyboardLanguageLayouts.put(subtype.getLanguageTag(), keyboardInfo);
break;
}
}
} else {
// if there is no auto-selected layout, we should show "Default"
KeyboardInfo keyboardInfo = new KeyboardInfo(
language,
mContext.getString(R.string.keyboard_default_layout),
info,
subtype);
mKeyboardLanguageLayouts.put(subtype.getLanguageTag(), keyboardInfo);
}
}
private void updatePreferenceLayout(PreferenceScreen preferenceScreen, InputMethodInfo info) {
if (mKeyboardLanguageLayouts.isEmpty()) {
return;
}
PreferenceCategory preferenceCategory = new PreferenceCategory(mContext);
preferenceCategory.setTitle(info.loadLabel(mContext.getPackageManager()).toString());
preferenceCategory.setKey(info.getPackageName());
preferenceScreen.addPreference(preferenceCategory);
for (Map.Entry<String, KeyboardInfo> entry : mKeyboardLanguageLayouts.entrySet()) {
final Preference pref = new Preference(mContext);
String key = "keyboard_language_label_" + String.valueOf(i);
String keyboardLanguageTitle = keyboardLanguages[i];
String keyboardLanguageSummary = keyboardLayouts[i];
// TODO: Waiting for new API to use a prefix with special number to setKey
String key = "keyboard_language_" + entry.getKey();
NewKeyboardSettingsUtils.KeyboardInfo keyboardInfo = entry.getValue();
pref.setKey(key);
pref.setTitle(keyboardLanguageTitle);
pref.setSummary(keyboardLanguageSummary);
pref.setTitle(keyboardInfo.getLanguage());
pref.setSummary(keyboardInfo.getLayout());
pref.setOnPreferenceClickListener(
preference -> {
showKeyboardLayoutPicker(
keyboardLanguageTitle,
keyboardLanguageSummary,
mInputDeviceIdentifier);
keyboardInfo.getLanguage(),
keyboardInfo.getLayout(),
mInputDeviceIdentifier,
mUserId,
keyboardInfo.getInputMethodInfo(),
keyboardInfo.getInputMethodSubtype());
return true;
});
category.addPreference(pref);
preferenceCategory.addPreference(pref);
}
}
@@ -96,7 +156,7 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
@Override
public void onInputDeviceChanged(int deviceId) {
if (mInputDeviceId >= 0 && deviceId == mInputDeviceId) {
// TODO(b/252816846): Need APIs to update the available keyboards.
updateCheckedState();
}
}
@@ -105,7 +165,9 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
super.onCreate(savedInstanceState);
mContext = getContext();
mIm = mContext.getSystemService(InputManager.class);
mImm = mContext.getSystemService(InputMethodManager.class);
mInputDeviceId = -1;
mUserId = UserHandle.myUserId();
}
@Override
@@ -131,7 +193,7 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
@Override
public void onResume() {
super.onResume();
// TODO(b/252816846): Need APIs to get the available keyboards from Inputmanager.
updateCheckedState();
}
@Override
@@ -149,17 +211,50 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
return R.xml.keyboard_settings_enabled_locales_list;
}
private void showKeyboardLayoutPicker(String language, String layout,
InputDeviceIdentifier inputDeviceIdentifier) {
private void showKeyboardLayoutPicker(
String language,
String layout,
InputDeviceIdentifier inputDeviceIdentifier,
int userId,
InputMethodInfo inputMethodInfo,
InputMethodSubtype inputMethodSubtype) {
Bundle arguments = new Bundle();
arguments.putParcelable(KeyboardLayoutPickerFragment.EXTRA_INPUT_DEVICE_IDENTIFIER,
inputDeviceIdentifier);
arguments.putString(NewKeyboardLayoutPickerFragment.EXTRA_TITLE, language);
arguments.putString(NewKeyboardLayoutPickerFragment.EXTRA_KEYBOARD_LAYOUT, layout);
arguments.putParcelable(
NewKeyboardSettingsUtils.EXTRA_INPUT_DEVICE_IDENTIFIER, inputDeviceIdentifier);
arguments.putParcelable(
NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_INFO, inputMethodInfo);
arguments.putParcelable(
NewKeyboardSettingsUtils.EXTRA_INPUT_METHOD_SUBTYPE, inputMethodSubtype);
arguments.putInt(NewKeyboardSettingsUtils.EXTRA_USER_ID, userId);
arguments.putString(NewKeyboardSettingsUtils.EXTRA_TITLE, language);
arguments.putString(NewKeyboardSettingsUtils.EXTRA_KEYBOARD_LAYOUT, layout);
new SubSettingLauncher(mContext)
.setSourceMetricsCategory(getMetricsCategory())
.setDestination(NewKeyboardLayoutPickerFragment.class.getName())
.setArguments(arguments)
.launch();
}
private KeyboardLayout[] getKeyboardLayouts(InputMethodInfo info, InputMethodSubtype subtype) {
return mIm.getKeyboardLayoutListForInputDevice(
mInputDeviceIdentifier, mUserId, info, subtype);
}
private String getKeyboardLayout(InputMethodInfo info, InputMethodSubtype subtype) {
return mIm.getKeyboardLayoutForInputDevice(
mInputDeviceIdentifier, mUserId, info, subtype);
}
private String getLanguage(InputMethodInfo info, InputMethodSubtype subtype) {
String language;
if (subtype.getLanguageTag().isEmpty()) {
language = subtype.getDisplayName(
mContext,
info.getPackageName(),
info.getServiceInfo().applicationInfo).toString();
} else {
language = Locale.forLanguageTag(subtype.getLanguageTag()).getDisplayName();
}
return language;
}
}