Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37528179 authored by Wilson Wu's avatar Wilson Wu Committed by Android (Google) Code Review
Browse files

Merge "Use AvailableVirtualKeyboardFragment for IME settings"

parents 5a750fc1 bc729455

res/xml/available_virtual_keyboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/add_virtual_keyboard">

    android:title="@string/virtual_keyboard_category">



</PreferenceScreen>

res/xml/language_and_input.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        <Preference

            android:key="virtual_keyboard_pref"

            android:title="@string/virtual_keyboard_category"

            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"

            android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment"

            settings:keywords="@string/keywords_virtual_keyboard"/>

        <Preference

            android:key="physical_keyboard_pref"
@@ -93,7 +93,7 @@ 
        <Preference

            android:key="virtual_keyboards_for_work_pref"

            android:title="@string/virtual_keyboards_for_work_title"

            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"

            android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment"

            settings:forWork="true"

            settings:controller="com.android.settings.inputmethod.VirtualKeyboardForWorkPreferenceController" />

res/xml/virtual_keyboard_settings.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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.

-->

<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/virtual_keyboard_category">

    <!-- Enabled input method list will be populated programmatically here. -->

    <Preference

        android:icon="@drawable/ic_add_24dp"

        android:key="add_virtual_keyboard_screen"

        android:title="@string/add_virtual_keyboard"

        android:order="1000"

        android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment"

        settings:controller="com.android.settings.inputmethod.InputMethodPreferenceController" />

</PreferenceScreen>

src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr 
                    || permittedList.contains(imi.getPackageName())

                    || enabledImis.contains(imi);

            final InputMethodPreference pref = new InputMethodPreference(

                    context, imi, true, isAllowedByOrganization, this);

                    context, imi, isAllowedByOrganization, this);

            pref.setIcon(imi.loadIcon(context.getPackageManager()));

            mInputMethodPreferenceList.add(pref);

        }

src/com/android/settings/inputmethod/InputMethodPreferenceController.java

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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.inputmethod;



import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodManager;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.BasePreferenceController;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.inputmethod.InputMethodPreference;



import com.google.common.annotations.VisibleForTesting;



import java.text.Collator;

import java.util.ArrayList;

import java.util.List;



public class InputMethodPreferenceController extends BasePreferenceController implements

        LifecycleObserver, OnStart {



    @VisibleForTesting

    PreferenceScreen mScreen;

    private Preference mPreference;

    private InputMethodManager mImm;

    private DevicePolicyManager mDpm;



    public InputMethodPreferenceController(Context context, String key) {

        super(context, key);

        mImm = context.getSystemService(InputMethodManager.class);

        mDpm = context.getSystemService(DevicePolicyManager.class);

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mScreen = screen;

        mPreference = mScreen.findPreference(getPreferenceKey());

    }



    @Override

    public void onStart() {

        updateInputMethodPreferenceViews();

    }



    private void updateInputMethodPreferenceViews() {

        final List<InputMethodPreference> preferenceList = new ArrayList<>();



        final List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();

        final List<InputMethodInfo> imis = mImm.getEnabledInputMethodList();

        final int N = (imis == null ? 0 : imis.size());

        for (int i = 0; i < N; ++i) {

            final InputMethodInfo imi = imis.get(i);

            final boolean isAllowedByOrganization = permittedList == null

                    || permittedList.contains(imi.getPackageName());

            final Drawable icon = imi.loadIcon(mContext.getPackageManager());

            final InputMethodPreference pref = new InputMethodPreference(

                    mScreen.getContext(),

                    imi,

                    false,  /* isImeEnabler */

                    isAllowedByOrganization,

                    null  /* this can be null since isImeEnabler is false */);

            pref.setIcon(icon);

            preferenceList.add(pref);

        }

        final Collator collator = Collator.getInstance();

        preferenceList.sort((lhs, rhs) -> lhs.compareTo(rhs, collator));

        mScreen.removeAll();

        for (int i = 0; i < N; ++i) {

            final InputMethodPreference pref = preferenceList.get(i);

            pref.setOrder(i);

            mScreen.addPreference(pref);

            pref.updatePreferenceViews();

        }

        mScreen.addPreference(mPreference);

    }

}