diff --git a/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java b/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java index 2bcc02e2b04..1e5145acb6d 100644 --- a/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java +++ b/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java @@ -22,6 +22,7 @@ import com.android.settings.accounts.AccountDashboardFragment; import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; +import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment; import com.android.settings.location.LocationServices; import java.util.Map; @@ -49,5 +50,7 @@ public class ProfileFragmentBridge { ProfileSelectStorageFragment.class.getName()); FRAGMENT_MAP.put(AvailableVirtualKeyboardFragment.class.getName(), ProfileSelectKeyboardFragment.class.getName()); + FRAGMENT_MAP.put(NewKeyboardLayoutEnabledLocalesFragment.class.getName(), + ProfileSelectPhysicalKeyboardFragment.class.getName()); } } diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java new file mode 100644 index 00000000000..3c1546e7d95 --- /dev/null +++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectPhysicalKeyboardFragment.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2023 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.dashboard.profileselector; + +import android.hardware.input.InputDeviceIdentifier; +import android.os.Bundle; +import android.provider.Settings; + +import androidx.fragment.app.Fragment; + +import com.android.settings.R; +import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment; + +/** + * When current user has work profile, this fragment used following fragments to represent the + * enabled IMEs keyboard layout settings page. + * + *
{@link NewKeyboardLayoutEnabledLocalesFragment} used to show both of personal/work user + * enabled IMEs and their physical keyboard layouts.
+ */ +public final class ProfileSelectPhysicalKeyboardFragment extends ProfileSelectFragment { + + private InputDeviceIdentifier mInputDeviceIdentifier; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + Bundle arguments = getArguments(); + mInputDeviceIdentifier = + arguments.getParcelable(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER); + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.keyboard_settings_enabled_locales_list; + } + + @Override + public Fragment[] getFragments() { + final Bundle personalOnly = new Bundle(); + personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL); + final Fragment personalFragment = new NewKeyboardLayoutEnabledLocalesFragment(); + personalOnly.putParcelable( + Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, mInputDeviceIdentifier); + personalFragment.setArguments(personalOnly); + + final Bundle workOnly = new Bundle(); + workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK); + final Fragment workFragment = new NewKeyboardLayoutEnabledLocalesFragment(); + workOnly.putParcelable(Settings.EXTRA_INPUT_DEVICE_IDENTIFIER, mInputDeviceIdentifier); + workFragment.setArguments(workOnly); + + return new Fragment[]{ + personalFragment, + workFragment + }; + } +} diff --git a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java index 3344f4e99d0..054ce610944 100644 --- a/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java +++ b/src/com/android/settings/inputmethod/NewKeyboardLayoutEnabledLocalesFragment.java @@ -23,6 +23,7 @@ import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; import android.os.Bundle; import android.os.UserHandle; +import android.os.UserManager; import android.util.Log; import android.view.InputDevice; import android.view.inputmethod.InputMethodInfo; @@ -34,8 +35,10 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; +import com.android.settings.dashboard.profileselector.ProfileSelectFragment; import com.android.settings.inputmethod.NewKeyboardSettingsUtils.KeyboardInfo; import java.util.ArrayList; @@ -56,6 +59,39 @@ public class NewKeyboardLayoutEnabledLocalesFragment extends DashboardFragment private Context mContext; private ArrayList