Use AvailableVirtualKeyboardFragment for IME settings

CL[1] make InputMethodPreference support:
-. Tap to corresponding IMEs settings
-. Using switch to enable/disble IMEs

Using AvailableVirtualKeyboardFragment for
language and input settings entries and
remove unused files.

[1]: I445551e4112117aabd8d7a48f53c29b7ffd8bafd

Bug: 197705032
Test: Manually test settings keyboard flow, test video in bug
Change-Id: I4d74df7d2dda71661e3298c7070459885aa308cb

res/xml/available_virtual_keyboard.xml

@@ -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

@@ -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

@@ -1,28 +0,0 @@
-<?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

@@ -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

@@ -1,102 +0,0 @@
-/*
- * 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);
-    }
-}

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

@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.inputmethod;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.util.Arrays;
-import java.util.List;
-
-@SearchIndexable
-public final class VirtualKeyboardFragment extends DashboardFragment {
-
-    private static final String TAG = "VirtualKeyboardFragment";
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.virtual_keyboard_settings;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.VIRTUAL_KEYBOARDS;
-    }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider() {
-                @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(
-                        Context context, boolean enabled) {
-                    final SearchIndexableResource sir = new SearchIndexableResource(context);
-                    sir.xmlResId = R.xml.virtual_keyboard_settings;
-                    return Arrays.asList(sir);
-                }
-            };
-}

tests/robotests/src/com/android/settings/inputmethod/InputMethodPreferenceControllerTest.java

@@ -1,87 +0,0 @@
-/*
- * 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 static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.inputmethod.InputMethodInfo;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowInputMethodManagerWithMethodList.class)
-public class InputMethodPreferenceControllerTest {
-
-    private InputMethodPreferenceController mController;
-    private Context mContext;
-    private PreferenceScreen mScreen;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mScreen = spy(new PreferenceScreen(mContext, null));
-        mPreference = new Preference(mContext);
-        mController = new InputMethodPreferenceController(mContext, "key");
-
-        when(mScreen.getPreferenceManager()).thenReturn(mock(PreferenceManager.class));
-        when(mScreen.getContext()).thenReturn(mContext);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-
-        mController.displayPreference(mScreen);
-    }
-
-    @Test
-    public void onStart_NoInputMethod_shouldHaveOnePreference() {
-        mController.onStart();
-
-        assertThat(mScreen.getPreferenceCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void onStart_hasInputMethod_shouldHaveCorrectPreferences() {
-        final List<InputMethodInfo> imis = new ArrayList<>();
-        imis.add(mock(InputMethodInfo.class));
-        imis.add(mock(InputMethodInfo.class));
-        when(imis.get(0).getPackageName()).thenReturn("name1");
-        when(imis.get(1).getPackageName()).thenReturn("name2");
-        ShadowInputMethodManagerWithMethodList.getShadow().setEnabledInputMethodList(imis);
-
-        mController.onStart();
-
-        assertThat(mScreen.getPreferenceCount()).isEqualTo(3);
-    }
-}