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

Commit 8c3bc196 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Remove unused IME_INVISIBLE flag" into main

parents 0b8413e9 ddece746

core/java/android/inputmethodservice/InputMethodService.java

+2 −9
Original line number Diff line number Diff line
@@ -522,13 +522,6 @@ public class InputMethodService extends AbstractInputMethodService { 
     */

    public static final int IME_VISIBLE = 0x2;



    /**

     * @hide

     * The IME is active and ready with views but set invisible.

     * This flag cannot be combined with {@link #IME_VISIBLE}.

     */

    public static final int IME_INVISIBLE = 0x4;



    /**

     * @hide

     * The IME is visible, but not yet perceptible to the user (e.g. fading in)
@@ -536,7 +529,7 @@ public class InputMethodService extends AbstractInputMethodService { 
     *

     * @see InputMethodManager#reportPerceptible

     */

    public static final int IME_VISIBLE_IMPERCEPTIBLE = 0x8;

    public static final int IME_VISIBLE_IMPERCEPTIBLE = 0x4;



    // Min and max values for back disposition.

    private static final int BACK_DISPOSITION_MIN = BACK_DISPOSITION_DEFAULT;
@@ -3125,7 +3118,7 @@ public class InputMethodService extends AbstractInputMethodService { 
        mInShowWindow = true;

        final int previousImeWindowStatus =

                (mDecorViewVisible ? IME_ACTIVE : 0) | (isInputViewShown()

                        ? (!mWindowVisible ? IME_INVISIBLE : IME_VISIBLE) : 0);

                        ? (!mWindowVisible ? -1 : IME_VISIBLE) : 0);

        startViews(prepareWindow(showInput));

        final int nextImeWindowStatus = mapToImeWindowStatus();

        if (previousImeWindowStatus != nextImeWindowStatus) {

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

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ public final class InputMethodPrivilegedOperations { 
     * @param backDisposition disposition flags

     * @see android.inputmethodservice.InputMethodService#IME_ACTIVE

     * @see android.inputmethodservice.InputMethodService#IME_VISIBLE

     * @see android.inputmethodservice.InputMethodService#IME_INVISIBLE

     * @see android.inputmethodservice.InputMethodService#BACK_DISPOSITION_DEFAULT

     * @see android.inputmethodservice.InputMethodService#BACK_DISPOSITION_ADJUST_NOTHING

     */

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+3 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.statusbar; 
import static android.app.StatusBarManager.DISABLE2_NONE;

import static android.app.StatusBarManager.DISABLE_NONE;

import static android.inputmethodservice.InputMethodService.BACK_DISPOSITION_DEFAULT;

import static android.inputmethodservice.InputMethodService.IME_INVISIBLE;

import static android.view.Display.INVALID_DISPLAY;



import android.annotation.Nullable;
@@ -1219,7 +1218,7 @@ public class CommandQueue extends IStatusBar.Stub implements 
                && mLastUpdatedImeDisplayId != INVALID_DISPLAY) {

            // Set previous NavBar's IME window status as invisible when IME

            // window switched to another display for single-session IME case.

            sendImeInvisibleStatusForPrevNavBar();

            sendImeNotVisibleStatusForPrevNavBar();

        }

        for (int i = 0; i < mCallbacks.size(); i++) {

            mCallbacks.get(i).setImeWindowStatus(displayId, vis, backDisposition, showImeSwitcher);
@@ -1227,9 +1226,9 @@ public class CommandQueue extends IStatusBar.Stub implements 
        mLastUpdatedImeDisplayId = displayId;

    }



    private void sendImeInvisibleStatusForPrevNavBar() {

    private void sendImeNotVisibleStatusForPrevNavBar() {

        for (int i = 0; i < mCallbacks.size(); i++) {

            mCallbacks.get(i).setImeWindowStatus(mLastUpdatedImeDisplayId, IME_INVISIBLE,

            mCallbacks.get(i).setImeWindowStatus(mLastUpdatedImeDisplayId, 0 /* vis */,

                    BACK_DISPOSITION_DEFAULT, false /* showImeSwitcher */);

        }

    }

packages/SystemUI/tests/src/com/android/systemui/navigationbar/views/NavigationBarTest.java

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.StatusBarManager.NAVIGATION_HINT_BACK_ALT; 
import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SHOWN;

import static android.app.StatusBarManager.NAVIGATION_HINT_IME_SWITCHER_SHOWN;

import static android.inputmethodservice.InputMethodService.BACK_DISPOSITION_DEFAULT;

import static android.inputmethodservice.InputMethodService.IME_INVISIBLE;

import static android.inputmethodservice.InputMethodService.IME_VISIBLE;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS;
@@ -512,7 +511,7 @@ public class NavigationBarTest extends SysuiTestCase { 


        externalNavBar.setImeWindowStatus(EXTERNAL_DISPLAY_ID, IME_VISIBLE,

                BACK_DISPOSITION_DEFAULT, true);

        defaultNavBar.setImeWindowStatus(DEFAULT_DISPLAY, IME_INVISIBLE,

        defaultNavBar.setImeWindowStatus(DEFAULT_DISPLAY, 0 /* vis */,

                BACK_DISPOSITION_DEFAULT, false);

        // Verify IME window state will be updated in external NavBar & default NavBar state reset.

        assertEquals(NAVIGATION_HINT_BACK_ALT | NAVIGATION_HINT_IME_SHOWN

packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ package com.android.systemui.statusbar; 


import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;

import static android.inputmethodservice.InputMethodService.BACK_DISPOSITION_DEFAULT;

import static android.inputmethodservice.InputMethodService.IME_INVISIBLE;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowInsetsController.BEHAVIOR_DEFAULT;
@@ -207,7 +206,7 @@ public class CommandQueueTest extends SysuiTestCase { 


        mCommandQueue.setImeWindowStatus(SECONDARY_DISPLAY, 1, 2, true);

        waitForIdleSync();

        verify(mCallbacks).setImeWindowStatus(eq(DEFAULT_DISPLAY), eq(IME_INVISIBLE),

        verify(mCallbacks).setImeWindowStatus(eq(DEFAULT_DISPLAY), eq(0),

                eq(BACK_DISPOSITION_DEFAULT), eq(false));

        verify(mCallbacks).setImeWindowStatus(eq(SECONDARY_DISPLAY), eq(1), eq(2), eq(true));

    }