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

Merge "[Physical Keyboard] Add intent support for PK layout setting page" into main

Browse Source
This commit is contained in:
Shaowei Shen
2024-12-03 01:23:19 +00:00
committed by Android (Google) Code Review
parent aaee1a1511 b7616da05c
commit 39d682a67a
6 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/Settings.java
View File

@@ -92,6 +92,9 @@ public class Settings extends SettingsActivity {
public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }
public static class PhysicalKeyboardLayoutPickerActivity extends SettingsActivity {
/* empty */
}
public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }
public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocalePickerActivity extends SettingsActivity { /* empty */ }

1
src/com/android/settings/inputmethod/InputPeripheralsSettingsUtils.java
View File

@@ -51,6 +51,7 @@ public class InputPeripheralsSettingsUtils {
static final String EXTRA_TITLE = "keyboard_layout_picker_title";
static final String EXTRA_USER_ID = "user_id";
static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";
static final String EXTRA_INPUT_DEVICE = "input_device";
static final String EXTRA_INPUT_METHOD_INFO = "input_method_info";
static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";

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

@@ -16,6 +16,7 @@
package com.android.settings.inputmethod;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.input.InputDeviceIdentifier;
@@ -35,6 +36,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
@@ -106,6 +108,16 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
mIm = mContext.getSystemService(InputManager.class);
mImm = mContext.getSystemService(InputMethodManager.class);
mInputDeviceId = -1;
Activity activity = Preconditions.checkNotNull(getActivity());
InputDevice inputDeviceFromIntent =
activity.getIntent().getParcelableExtra(
InputPeripheralsSettingsUtils.EXTRA_INPUT_DEVICE,
InputDevice.class);
if (inputDeviceFromIntent != null) {
launchLayoutPickerWithIdentifier(inputDeviceFromIntent.getIdentifier());
}
}
@Override
@@ -161,6 +173,23 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment
mInputDeviceId = -1;
}
private void launchLayoutPickerWithIdentifier(
InputDeviceIdentifier inputDeviceIdentifier) {
if (InputPeripheralsSettingsUtils.getInputDevice(mIm, inputDeviceIdentifier) == null) {
return;
}
InputMethodInfo info = mImm.getCurrentInputMethodInfoAsUser(UserHandle.of(mUserId));
InputMethodSubtype subtype = mImm.getCurrentInputMethodSubtype();
CharSequence subtypeLabel = getSubtypeLabel(mContext, info, subtype);
showKeyboardLayoutPicker(
subtypeLabel,
inputDeviceIdentifier,
mUserId,
info,
subtype);
}
private void updateCheckedState() {
if (InputPeripheralsSettingsUtils.getInputDevice(mIm, mInputDeviceIdentifier) == null) {
return;