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

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

Merge "Remove ime_switcher_revamp and _api flags" into main

parents 6f262c58 f73a2be7

core/api/current.txt

+10 −10
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ package android { 
    field public static final int label = 16842753; // 0x1010001

    field public static final int labelFor = 16843718; // 0x10103c6

    field @Deprecated public static final int labelTextSize = 16843317; // 0x1010235

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int languageSettingsActivity = 16844453; // 0x10106a5

    field public static final int languageSettingsActivity = 16844453; // 0x10106a5

    field public static final int languageTag = 16844040; // 0x1010508

    field public static final int largeHeap = 16843610; // 0x101035a

    field public static final int largeScreens = 16843398; // 0x1010286
@@ -1101,7 +1101,7 @@ package android { 
    field public static final int layout = 16842994; // 0x10100f2

    field public static final int layoutAnimation = 16842988; // 0x10100ec

    field public static final int layoutDirection = 16843698; // 0x10103b2

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final int layoutLabel = 16844458; // 0x10106aa

    field public static final int layoutLabel = 16844458; // 0x10106aa

    field public static final int layoutMode = 16843738; // 0x10103da

    field public static final int layout_above = 16843140; // 0x1010184

    field public static final int layout_alignBaseline = 16843142; // 0x1010186
@@ -21624,7 +21624,7 @@ package android.inputmethodservice { 
    method @Deprecated public android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();

    method public android.view.View onCreateInputView();

    method protected void onCurrentInputMethodSubtypeChanged(android.view.inputmethod.InputMethodSubtype);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public void onCustomImeSwitcherButtonRequestedVisible(boolean);

    method public void onCustomImeSwitcherButtonRequestedVisible(boolean);

    method public void onDisplayCompletions(android.view.inputmethod.CompletionInfo[]);

    method public boolean onEvaluateFullscreenMode();

    method @CallSuper public boolean onEvaluateInputViewShown();
@@ -58388,7 +58388,7 @@ package android.view.inputmethod { 
  public final class InputMethodInfo implements android.os.Parcelable {

    ctor public InputMethodInfo(android.content.Context, android.content.pm.ResolveInfo) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    ctor public InputMethodInfo(String, String, CharSequence, String);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @Nullable public android.content.Intent createImeLanguageSettingsActivityIntent();

    method @Nullable public android.content.Intent createImeLanguageSettingsActivityIntent();

    method @Nullable public android.content.Intent createStylusHandwritingSettingsActivityIntent();

    method public int describeContents();

    method public void dump(android.util.Printer, String);
@@ -58409,7 +58409,7 @@ package android.view.inputmethod { 
    method public boolean supportsStylusHandwriting();

    method public boolean suppressesSpellChecker();

    method public void writeToParcel(android.os.Parcel, int);

    field @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") public static final String ACTION_IME_LANGUAGE_SETTINGS = "android.view.inputmethod.action.IME_LANGUAGE_SETTINGS";

    field public static final String ACTION_IME_LANGUAGE_SETTINGS = "android.view.inputmethod.action.IME_LANGUAGE_SETTINGS";

    field public static final String ACTION_STYLUS_HANDWRITING_SETTINGS = "android.view.inputmethod.action.STYLUS_HANDWRITING_SETTINGS";

    field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InputMethodInfo> CREATOR;

  }
@@ -58510,9 +58510,9 @@ package android.view.inputmethod { 
    method public String getExtraValueOf(String);

    method public int getIconResId();

    method @NonNull public String getLanguageTag();

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @NonNull public CharSequence getLayoutDisplayName(@NonNull android.content.Context, @NonNull android.content.pm.ApplicationInfo);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @NonNull public CharSequence getLayoutLabelNonLocalized();

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @StringRes public int getLayoutLabelResource();

    method @NonNull public CharSequence getLayoutDisplayName(@NonNull android.content.Context, @NonNull android.content.pm.ApplicationInfo);

    method @NonNull public CharSequence getLayoutLabelNonLocalized();

    method @StringRes public int getLayoutLabelResource();

    method @Deprecated @NonNull public String getLocale();

    method public String getMode();

    method @NonNull public CharSequence getNameOverride();
@@ -58532,8 +58532,8 @@ package android.view.inputmethod { 
    method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setIsAsciiCapable(boolean);

    method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setIsAuxiliary(boolean);

    method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setLanguageTag(String);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @NonNull public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setLayoutLabelNonLocalized(@NonNull CharSequence);

    method @FlaggedApi("android.view.inputmethod.ime_switcher_revamp_api") @NonNull public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setLayoutLabelResource(@StringRes int);

    method @NonNull public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setLayoutLabelNonLocalized(@NonNull CharSequence);

    method @NonNull public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setLayoutLabelResource(@StringRes int);

    method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setOverridesImplicitlyEnabledSubtype(boolean);

    method @NonNull public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setPhysicalKeyboardHint(@Nullable android.icu.util.ULocale, @NonNull String);

    method public android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder setSubtypeExtraValue(String);

core/java/android/inputmethodservice/AbstractInputMethodService.java

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.view.KeyEvent; 
import android.view.MotionEvent;

import android.view.WindowManager;

import android.view.WindowManagerGlobal;

import android.view.inputmethod.Flags;

import android.view.inputmethod.InputMethod;

import android.view.inputmethod.InputMethodSession;

import android.window.WindowProviderService;
@@ -190,7 +189,7 @@ public abstract class AbstractInputMethodService extends WindowProviderService 
            if (callback != null) {

                callback.finishedEvent(seq, handled);

            }

            if (Flags.imeSwitcherRevamp() && !handled && event.getAction() == KeyEvent.ACTION_DOWN

            if (!handled && event.getAction() == KeyEvent.ACTION_DOWN

                    && event.getUnicodeChar() > 0 && mInputMethodServiceInternal != null) {

                mInputMethodServiceInternal.notifyUserActionIfNecessary();

            }

core/java/android/inputmethodservice/InputMethodService.java

+0 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECT 
import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECTIONLESS_HANDWRITING_ERROR_OTHER;

import static android.view.inputmethod.ConnectionlessHandwritingCallback.CONNECTIONLESS_HANDWRITING_ERROR_UNSUPPORTED;

import static android.view.inputmethod.Flags.FLAG_CONNECTIONLESS_HANDWRITING;

import static android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API;

import static android.view.inputmethod.Flags.FLAG_VERIFY_KEY_EVENT;

import static android.view.inputmethod.Flags.ctrlShiftShortcut;
@@ -4371,7 +4370,6 @@ public class InputMethodService extends AbstractInputMethodService { 
     *

     * @param visible whether the button is requested visible or not.

     */

    @FlaggedApi(FLAG_IME_SWITCHER_REVAMP_API)

    public void onCustomImeSwitcherButtonRequestedVisible(boolean visible) {

        // Intentionally empty

    }

core/java/android/inputmethodservice/NavigationBarController.java

+0 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.view.WindowInsets; 
import android.view.WindowInsetsController.Appearance;

import android.view.animation.Interpolator;

import android.view.animation.PathInterpolator;

import android.view.inputmethod.Flags;

import android.view.inputmethod.InputMethodManager;

import android.widget.FrameLayout;
@@ -548,9 +547,6 @@ final class NavigationBarController implements Window.DecorCallback, 
     */

    private void checkCustomImeSwitcherButtonRequestedVisible(boolean buttonVisible,

            boolean shouldDrawImeNavBar, boolean imeNavBarNotVisible) {

        if (!Flags.imeSwitcherRevampApi()) {

            return;

        }

        // The system nav bar will be hidden when the IME is shown and the config is set.

        final boolean navBarNotVisible = shouldDrawImeNavBar ? imeNavBarNotVisible

                : mService.getResources().getBoolean(

core/java/android/inputmethodservice/navigationbar/KeyButtonView.java

+2 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.view.View; 
import android.view.ViewConfiguration;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.inputmethod.Flags;

import android.view.inputmethod.InputConnection;

import android.widget.ImageView;
@@ -142,8 +141,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
     */

    @Nullable

    private CharSequence getAccessibilityLongClickActionLabel() {

        if (Flags.imeSwitcherRevamp()

                && getId() == com.android.internal.R.id.input_method_nav_ime_switcher) {

        if (getId() == com.android.internal.R.id.input_method_nav_ime_switcher) {

            return getContext().getText(

                    com.android.internal.R.string.input_method_ime_switch_long_click_action_desc);

        }
@@ -208,7 +206,7 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
                if (!showSwipeUI) {

                    playSoundEffect(SoundEffectConstants.CLICK);

                }

                if (Flags.imeSwitcherRevamp() && isLongClickable()) {

                if (isLongClickable()) {

                    removeCallbacks(mCheckLongPress);

                    postDelayed(mCheckLongPress, getLongPressTimeoutMillis());

                }