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

Commit e3d3d677 authored by Feng Cao's avatar Feng Cao
Browse files

Change InlineSuggestionsRequest.getSupportedLocales() to return empty if not specified 

Test: atest android.view.inputmethod.cts.InlineSuggestionsRequestTest
Bug: 169273070

Change-Id: I3858d3e4d07341d1f80768e51e5617ad8b6cd58c
parent 98d8a3a9

core/java/android/view/inputmethod/InlineSuggestionsRequest.java

+25 −7
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ package android.view.inputmethod; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityThread;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.os.Build;

import android.os.Bundle;

import android.os.IBinder;

import android.os.LocaleList;
@@ -69,7 +73,8 @@ public final class InlineSuggestionsRequest implements Parcelable { 


    /**

     * The IME provided locales for the request. If non-empty, the inline suggestions should

     * return languages from the supported locales. If not provided, it'll default to system locale.

     * return languages from the supported locales. If not provided, it'll default to be empty if

     * target SDK is S or above, and default to system locale otherwise.

     *

     * <p>Note for Autofill Providers: It is <b>recommended</b> for the returned inline suggestions

     * to have one locale to guarantee consistent UI rendering.</p>
@@ -156,7 +161,18 @@ public final class InlineSuggestionsRequest implements Parcelable { 
        return ActivityThread.currentPackageName();

    }



    /**

     * The {@link InlineSuggestionsRequest#getSupportedLocales()} now returns empty locale list when

     * it's not set, instead of the default system locale.

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    private static final long IME_AUTOFILL_DEFAULT_SUPPORTED_LOCALES_IS_EMPTY = 169273070L;



    private static LocaleList defaultSupportedLocales() {

        if (CompatChanges.isChangeEnabled(IME_AUTOFILL_DEFAULT_SUPPORTED_LOCALES_IS_EMPTY)) {

            return LocaleList.getEmptyLocaleList();

        }

        return LocaleList.getDefault();

    }
@@ -189,7 +205,7 @@ public final class InlineSuggestionsRequest implements Parcelable { 






    // Code below generated by codegen v1.0.15.

    // Code below generated by codegen v1.0.22.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code
@@ -264,7 +280,8 @@ public final class InlineSuggestionsRequest implements Parcelable { 


    /**

     * The IME provided locales for the request. If non-empty, the inline suggestions should

     * return languages from the supported locales. If not provided, it'll default to system locale.

     * return languages from the supported locales. If not provided, it'll default to be empty if

     * target SDK is S or above, and default to system locale otherwise.

     *

     * <p>Note for Autofill Providers: It is <b>recommended</b> for the returned inline suggestions

     * to have one locale to guarantee consistent UI rendering.</p>
@@ -522,7 +539,8 @@ public final class InlineSuggestionsRequest implements Parcelable { 


        /**

         * The IME provided locales for the request. If non-empty, the inline suggestions should

         * return languages from the supported locales. If not provided, it'll default to system locale.

         * return languages from the supported locales. If not provided, it'll default to be empty if

         * target SDK is S or above, and default to system locale otherwise.

         *

         * <p>Note for Autofill Providers: It is <b>recommended</b> for the returned inline suggestions

         * to have one locale to guarantee consistent UI rendering.</p>
@@ -622,10 +640,10 @@ public final class InlineSuggestionsRequest implements Parcelable { 
    }



    @DataClass.Generated(

            time = 1595457701315L,

            codegenVersion = "1.0.15",

            time = 1612206506050L,

            codegenVersion = "1.0.22",

            sourceFile = "frameworks/base/core/java/android/view/inputmethod/InlineSuggestionsRequest.java",

            inputSignatures = "public static final  int SUGGESTION_COUNT_UNLIMITED\nprivate final  int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.widget.inline.InlinePresentationSpec> mInlinePresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.NonNull android.os.Bundle mExtras\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate  int mHostDisplayId\npublic  void setHostInputToken(android.os.IBinder)\nprivate  boolean extrasEquals(android.os.Bundle)\nprivate  void parcelHostInputToken(android.os.Parcel,int)\nprivate @android.annotation.Nullable android.os.IBinder unparcelHostInputToken(android.os.Parcel)\npublic  void setHostDisplayId(int)\nprivate  void onConstructed()\npublic  void filterContentTypes()\nprivate static  int defaultMaxSuggestionCount()\nprivate static  java.lang.String defaultHostPackageName()\nprivate static  android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable int defaultHostDisplayId()\nprivate static @android.annotation.NonNull android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(java.util.List<android.widget.inline.InlinePresentationSpec>)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []")

            inputSignatures = "public static final  int SUGGESTION_COUNT_UNLIMITED\nprivate final  int mMaxSuggestionCount\nprivate final @android.annotation.NonNull java.util.List<android.widget.inline.InlinePresentationSpec> mInlinePresentationSpecs\nprivate @android.annotation.NonNull java.lang.String mHostPackageName\nprivate @android.annotation.NonNull android.os.LocaleList mSupportedLocales\nprivate @android.annotation.NonNull android.os.Bundle mExtras\nprivate @android.annotation.Nullable android.os.IBinder mHostInputToken\nprivate  int mHostDisplayId\nprivate static final @android.compat.annotation.ChangeId @android.compat.annotation.EnabledSince long IME_AUTOFILL_DEFAULT_SUPPORTED_LOCALES_IS_EMPTY\npublic  void setHostInputToken(android.os.IBinder)\nprivate  boolean extrasEquals(android.os.Bundle)\nprivate  void parcelHostInputToken(android.os.Parcel,int)\nprivate @android.annotation.Nullable android.os.IBinder unparcelHostInputToken(android.os.Parcel)\npublic  void setHostDisplayId(int)\nprivate  void onConstructed()\npublic  void filterContentTypes()\nprivate static  int defaultMaxSuggestionCount()\nprivate static  java.lang.String defaultHostPackageName()\nprivate static  android.os.LocaleList defaultSupportedLocales()\nprivate static @android.annotation.Nullable android.os.IBinder defaultHostInputToken()\nprivate static @android.annotation.Nullable int defaultHostDisplayId()\nprivate static @android.annotation.NonNull android.os.Bundle defaultExtras()\nclass InlineSuggestionsRequest extends java.lang.Object implements [android.os.Parcelable]\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(java.util.List<android.widget.inline.InlinePresentationSpec>)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genToString=true, genBuilder=true)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(java.util.List<android.widget.inline.InlinePresentationSpec>)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostPackageName(java.lang.String)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostInputToken(android.os.IBinder)\nabstract  android.view.inputmethod.InlineSuggestionsRequest.Builder setHostDisplayId(int)\nclass BaseBuilder extends java.lang.Object implements []")

    @Deprecated

    private void __metadata() {}