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

Commit 136b6cec authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Revert "Shift+Meta+Space should reverse-rotate subtypes." 

This reverts commit d39ae854 [1].

Reason for revert: to deprecate Meta-Space.

 [1]: I3694edd80be6dfe18b90360e24ae4d451b331928

Bug: 79150878
Test: manual
Change-Id: Id2ee2e552ffec009722525a56c65767bda46a63b
parent c7cc0ca7

core/java/com/android/internal/inputmethod/InputMethodSubtypeSwitchingController.java

+9 −11
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ public class InputMethodSubtypeSwitchingController { 
        }



        public ImeSubtypeListItem getNextInputMethodLocked(boolean onlyCurrentIme,

                InputMethodInfo imi, InputMethodSubtype subtype, boolean forward) {

                InputMethodInfo imi, InputMethodSubtype subtype) {

            if (imi == null) {

                return null;

            }
@@ -304,9 +304,8 @@ public class InputMethodSubtypeSwitchingController { 
                return null;

            }

            final int N = mImeSubtypeList.size();

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

            for (int offset = 1; offset < N; ++offset) {

                // Start searching the next IME/subtype from the next of the current index.

                final int offset = forward ? i : N - i;

                final int candidateIndex = (currentIndex + offset) % N;

                final ImeSubtypeListItem candidate = mImeSubtypeList.get(candidateIndex);

                // Skip if searching inside the current IME only, but the candidate is not
@@ -379,7 +378,7 @@ public class InputMethodSubtypeSwitchingController { 
        }



        public ImeSubtypeListItem getNextInputMethodLocked(boolean onlyCurrentIme,

                InputMethodInfo imi, InputMethodSubtype subtype, boolean forward) {

                InputMethodInfo imi, InputMethodSubtype subtype) {

            int currentUsageRank = getUsageRank(imi, subtype);

            if (currentUsageRank < 0) {

                if (DEBUG) {
@@ -389,8 +388,7 @@ public class InputMethodSubtypeSwitchingController { 
            }

            final int N = mUsageHistoryOfSubtypeListItemIndex.length;

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

                final int offset = forward ? i : N - i;

                final int subtypeListItemRank = (currentUsageRank + offset) % N;

                final int subtypeListItemRank = (currentUsageRank + i) % N;

                final int subtypeListItemIndex =

                        mUsageHistoryOfSubtypeListItemIndex[subtypeListItemRank];

                final ImeSubtypeListItem subtypeListItem =
@@ -464,16 +462,16 @@ public class InputMethodSubtypeSwitchingController { 
        }



        public ImeSubtypeListItem getNextInputMethod(boolean onlyCurrentIme, InputMethodInfo imi,

                InputMethodSubtype subtype, boolean forward) {

                InputMethodSubtype subtype) {

            if (imi == null) {

                return null;

            }

            if (imi.supportsSwitchingToNextInputMethod()) {

                return mSwitchingAwareRotationList.getNextInputMethodLocked(onlyCurrentIme, imi,

                        subtype, forward);

                        subtype);

            } else {

                return mSwitchingUnawareRotationList.getNextInputMethodLocked(onlyCurrentIme, imi,

                        subtype, forward);

                        subtype);

            }

        }
@@ -541,14 +539,14 @@ public class InputMethodSubtypeSwitchingController { 
    }



    public ImeSubtypeListItem getNextInputMethodLocked(boolean onlyCurrentIme, InputMethodInfo imi,

            InputMethodSubtype subtype, boolean forward) {

            InputMethodSubtype subtype) {

        if (mController == null) {

            if (DEBUG) {

                Log.e(TAG, "mController shouldn't be null.");

            }

            return null;

        }

        return mController.getNextInputMethod(onlyCurrentIme, imi, subtype, forward);

        return mController.getNextInputMethod(onlyCurrentIme, imi, subtype);

    }



    public List<ImeSubtypeListItem> getSortedInputMethodAndSubtypeListLocked(

core/tests/coretests/src/com/android/internal/inputmethod/InputMethodSubtypeSwitchingControllerTest.java

+23 −27
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; 


import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController.ControllerImpl;

import com.android.internal.inputmethod.InputMethodSubtypeSwitchingController.ImeSubtypeListItem;

import com.android.internal.inputmethod.InputMethodUtils;



import org.junit.Test;

import org.junit.runner.RunWith;
@@ -78,7 +79,7 @@ public class InputMethodSubtypeSwitchingControllerTest { 
        ri.serviceInfo = si;

        List<InputMethodSubtype> subtypes = null;

        if (subtypeLocales != null) {

            subtypes = new ArrayList<>();

            subtypes = new ArrayList<InputMethodSubtype>();

            for (String subtypeLocale : subtypeLocales) {

                subtypes.add(createDummySubtype(subtypeLocale));

            }
@@ -128,7 +129,7 @@ public class InputMethodSubtypeSwitchingControllerTest { 
    }



    private static List<ImeSubtypeListItem> createEnabledImeSubtypes() {

        final List<ImeSubtypeListItem> items = new ArrayList<>();

        final List<ImeSubtypeListItem> items = new ArrayList<ImeSubtypeListItem>();

        addDummyImeSubtypeListItems(items, "LatinIme", "LatinIme", Arrays.asList("en_US", "fr"),

                true /* supportsSwitchingToNextInputMethod*/);

        addDummyImeSubtypeListItems(items, "switchUnawareLatinIme", "switchUnawareLatinIme",
@@ -144,7 +145,7 @@ public class InputMethodSubtypeSwitchingControllerTest { 
    }



    private static List<ImeSubtypeListItem> createDisabledImeSubtypes() {

        final List<ImeSubtypeListItem> items = new ArrayList<>();

        final List<ImeSubtypeListItem> items = new ArrayList<ImeSubtypeListItem>();

        addDummyImeSubtypeListItems(items,

                "UnknownIme", "UnknownIme",

                Arrays.asList("en_US", "hi"),
@@ -160,18 +161,15 @@ public class InputMethodSubtypeSwitchingControllerTest { 
    }



    private void assertNextInputMethod(final ControllerImpl controller,

            final boolean onlyCurrentIme, final ImeSubtypeListItem currentItem,

            final ImeSubtypeListItem nextItem, final ImeSubtypeListItem prevItem) {

            final boolean onlyCurrentIme,

            final ImeSubtypeListItem currentItem, final ImeSubtypeListItem nextItem) {

        InputMethodSubtype subtype = null;

        if (currentItem.mSubtypeName != null) {

            subtype = createDummySubtype(currentItem.mSubtypeName.toString());

        }

        final ImeSubtypeListItem nextIme = controller.getNextInputMethod(onlyCurrentIme,

                currentItem.mImi, subtype, true /* forward */);

                currentItem.mImi, subtype);

        assertEquals(nextItem, nextIme);

        final ImeSubtypeListItem prevIme = controller.getNextInputMethod(onlyCurrentIme,

                currentItem.mImi, subtype, false /* forward */);

        assertEquals(prevItem, prevIme);

    }



    private void assertRotationOrder(final ControllerImpl controller,
@@ -180,13 +178,11 @@ public class InputMethodSubtypeSwitchingControllerTest { 
        final int N = expectedRotationOrderOfImeSubtypeList.length;

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

            final int currentIndex = i;

            final int prevIndex = (currentIndex + N - 1) % N;

            final int nextIndex = (currentIndex + 1) % N;

            final ImeSubtypeListItem currentItem =

                    expectedRotationOrderOfImeSubtypeList[currentIndex];

            final ImeSubtypeListItem nextItem = expectedRotationOrderOfImeSubtypeList[nextIndex];

            final ImeSubtypeListItem prevItem = expectedRotationOrderOfImeSubtypeList[prevIndex];

            assertNextInputMethod(controller, onlyCurrentIme, currentItem, nextItem, prevItem);

            assertNextInputMethod(controller, onlyCurrentIme, currentItem, nextItem);

        }

    }
@@ -234,29 +230,29 @@ public class InputMethodSubtypeSwitchingControllerTest { 
        assertRotationOrder(controller, true /* onlyCurrentIme */,

                switchingUnawarelatinIme_en_UK, switchingUnawarelatinIme_hi);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                subtypeUnawareIme, null, null);

                subtypeUnawareIme, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                japaneseIme_ja_JP, null, null);

                japaneseIme_ja_JP, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                switchUnawareJapaneseIme_ja_JP, null, null);

                switchUnawareJapaneseIme_ja_JP, null);



        // Make sure that disabled IMEs are not accepted.

        assertNextInputMethod(controller, false /* onlyCurrentIme */,

                disabledIme_en_US, null, null);

                disabledIme_en_US, null);

        assertNextInputMethod(controller, false /* onlyCurrentIme */,

                disabledIme_hi, null, null);

                disabledIme_hi, null);

        assertNextInputMethod(controller, false /* onlyCurrentIme */,

                disabledSwitchingUnawareIme, null, null);

                disabledSwitchingUnawareIme, null);

        assertNextInputMethod(controller, false /* onlyCurrentIme */,

                disabledSubtypeUnawareIme, null, null);

                disabledSubtypeUnawareIme, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                disabledIme_en_US, null, null);

                disabledIme_en_US, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                disabledIme_hi, null, null);

                disabledIme_hi, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                disabledSwitchingUnawareIme, null, null);

                disabledSwitchingUnawareIme, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                disabledSubtypeUnawareIme, null, null);

                disabledSubtypeUnawareIme, null);

    }



    @Test
@@ -290,7 +286,7 @@ public class InputMethodSubtypeSwitchingControllerTest { 
                japaneseIme_ja_JP, latinIme_fr, latinIme_en_US);

        // Check onlyCurrentIme == true.

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                japaneseIme_ja_JP, null, null);

                japaneseIme_ja_JP, null);

        assertRotationOrder(controller, true /* onlyCurrentIme */,

                latinIme_fr, latinIme_en_US);

        assertRotationOrder(controller, true /* onlyCurrentIme */,
@@ -314,9 +310,9 @@ public class InputMethodSubtypeSwitchingControllerTest { 
        assertRotationOrder(controller, true /* onlyCurrentIme */,

                switchingUnawarelatinIme_en_UK, switchingUnawarelatinIme_hi);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                subtypeUnawareIme, null, null);

                subtypeUnawareIme, null);

        assertNextInputMethod(controller, true /* onlyCurrentIme */,

                switchUnawareJapaneseIme_ja_JP, null, null);

                switchUnawareJapaneseIme_ja_JP, null);



        // Rotation order should be preserved when created with the same subtype list.

        final List<ImeSubtypeListItem> sameEnabledItems = createEnabledImeSubtypes();
@@ -342,7 +338,7 @@ public class InputMethodSubtypeSwitchingControllerTest { 


    @Test

    public void testImeSubtypeListItem() throws Exception {

        final List<ImeSubtypeListItem> items = new ArrayList<>();

        final List<ImeSubtypeListItem> items = new ArrayList<ImeSubtypeListItem>();

        addDummyImeSubtypeListItems(items, "LatinIme", "LatinIme",

                Arrays.asList("en_US", "fr", "en", "en_uk", "enn", "e", "EN_US"),

                true /* supportsSwitchingToNextInputMethod*/);

services/core/java/com/android/server/InputMethodManagerService.java

+4 −5
Original line number Diff line number Diff line
@@ -3108,8 +3108,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                return false;

            }

            final ImeSubtypeListItem nextSubtype = mSwitchingController.getNextInputMethodLocked(

                    onlyCurrentIme, mMethodMap.get(mCurMethodId), mCurrentSubtype,

                    true /* forward */);

                    onlyCurrentIme, mMethodMap.get(mCurMethodId), mCurrentSubtype);

            if (nextSubtype == null) {

                return false;

            }
@@ -3129,8 +3128,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                return false;

            }

            final ImeSubtypeListItem nextSubtype = mSwitchingController.getNextInputMethodLocked(

                    false /* onlyCurrentIme */, mMethodMap.get(mCurMethodId), mCurrentSubtype,

                    true /* forward */);

                    false /* onlyCurrentIme */, mMethodMap.get(mCurMethodId), mCurrentSubtype);

            if (nextSubtype == null) {

                return false;

            }
@@ -3551,8 +3549,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


    private void handleSwitchInputMethod(final boolean forwardDirection) {

        synchronized (mMethodMap) {

            // TODO: Support forwardDirection.

            final ImeSubtypeListItem nextSubtype = mSwitchingController.getNextInputMethodLocked(

                    false, mMethodMap.get(mCurMethodId), mCurrentSubtype, forwardDirection);

                    false, mMethodMap.get(mCurMethodId), mCurrentSubtype);

            if (nextSubtype == null) {

                return;

            }