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

Commit d010145d authored by Haoran Zhang's avatar Haoran Zhang Committed by Automerger Merge Worker
Browse files

Merge "Change default value of AFAA flags to be on." into udc-dev am:... 

Merge "Change default value of AFAA flags to be on." into udc-dev am: 3d5ad7b9 am: 3a762d4f am: af7e21e7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23214182



Change-Id: I3fb6c6928cd05232931d0942d65a4fe43862dad7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f48788ce af7e21e7

core/java/android/view/autofill/AutofillFeatureFlags.java

+23 −7
Original line number Diff line number Diff line
@@ -275,6 +275,14 @@ public class AutofillFeatureFlags { 
    public static final boolean DEFAULT_AUTOFILL_PCC_CLASSIFICATION_ENABLED = false;

    // END AUTOFILL PCC CLASSIFICATION FLAGS DEFAULTS



    // AUTOFILL FOR ALL APPS DEFAULTS

    private static final boolean DEFAULT_AFAA_ON_UNIMPORTANT_VIEW_ENABLED = true;

    private static final boolean DEFAULT_AFAA_ON_IMPORTANT_VIEW_ENABLED = true;

    private static final String DEFAULT_AFAA_DENYLIST = "";

    private static final String DEFAULT_AFAA_ALLOWLIST = "";

    private static final String DEFAULT_AFAA_NON_AUTOFILLABLE_IME_ACTIONS = "2,3,4";

    private static final boolean DEFAULT_AFAA_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES = true;

    private static final boolean DEFAULT_AFAA_SHOULD_ENABLE_MULTILINE_FILTER = true;



    private AutofillFeatureFlags() {};
@@ -330,7 +338,8 @@ public class AutofillFeatureFlags { 
    public static boolean isTriggerFillRequestOnUnimportantViewEnabled() {

        return DeviceConfig.getBoolean(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_UNIMPORTANT_VIEW, false);

            DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_UNIMPORTANT_VIEW,

            DEFAULT_AFAA_ON_UNIMPORTANT_VIEW_ENABLED);

    }



    /**
@@ -341,7 +350,8 @@ public class AutofillFeatureFlags { 
    public static boolean isTriggerFillRequestOnFilteredImportantViewsEnabled() {

        return DeviceConfig.getBoolean(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_FILTERED_IMPORTANT_VIEWS, false);

            DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_FILTERED_IMPORTANT_VIEWS,

            DEFAULT_AFAA_ON_IMPORTANT_VIEW_ENABLED);

    }



    /**
@@ -352,7 +362,8 @@ public class AutofillFeatureFlags { 
    public static boolean shouldEnableAutofillOnAllViewTypes(){

        return DeviceConfig.getBoolean(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES, false);

            DEVICE_CONFIG_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES,

            DEFAULT_AFAA_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES);

    }



    /**
@@ -363,7 +374,9 @@ public class AutofillFeatureFlags { 
     */

    public static Set<String> getNonAutofillableImeActionIdSetFromFlag() {

        final String mNonAutofillableImeActions = DeviceConfig.getString(

                DeviceConfig.NAMESPACE_AUTOFILL, DEVICE_CONFIG_NON_AUTOFILLABLE_IME_ACTION_IDS, "");

                DeviceConfig.NAMESPACE_AUTOFILL,

                DEVICE_CONFIG_NON_AUTOFILLABLE_IME_ACTION_IDS,

                DEFAULT_AFAA_NON_AUTOFILLABLE_IME_ACTIONS);

        return new ArraySet<>(Arrays.asList(mNonAutofillableImeActions.split(",")));

    }
@@ -378,7 +391,8 @@ public class AutofillFeatureFlags { 
    public static String getDenylistStringFromFlag() {

        return DeviceConfig.getString(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_PACKAGE_DENYLIST_FOR_UNIMPORTANT_VIEW, "");

            DEVICE_CONFIG_PACKAGE_DENYLIST_FOR_UNIMPORTANT_VIEW,

            DEFAULT_AFAA_DENYLIST);

    }



    /**
@@ -389,7 +403,8 @@ public class AutofillFeatureFlags { 
    public static String getAllowlistStringFromFlag() {

        return DeviceConfig.getString(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_PACKAGE_AND_ACTIVITY_ALLOWLIST_FOR_TRIGGERING_FILL_REQUEST, "");

            DEVICE_CONFIG_PACKAGE_AND_ACTIVITY_ALLOWLIST_FOR_TRIGGERING_FILL_REQUEST,

            DEFAULT_AFAA_ALLOWLIST);

    }

    /**

     * Whether include all views that have autofill type not none in assist structure.
@@ -422,7 +437,8 @@ public class AutofillFeatureFlags { 
    public static boolean shouldEnableMultilineFilter() {

        return DeviceConfig.getBoolean(

            DeviceConfig.NAMESPACE_AUTOFILL,

            DEVICE_CONFIG_MULTILINE_FILTER_ENABLED, false);

            DEVICE_CONFIG_MULTILINE_FILTER_ENABLED,

            DEFAULT_AFAA_SHOULD_ENABLE_MULTILINE_FILTER);

    }



    // START AUTOFILL PCC CLASSIFICATION FUNCTIONS