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

Commit d48e4362 authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Add flags for new features" into main am: 90cd1955 

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



Change-Id: I10d84bd5c5f101a3bb30f1fc7e5318961d04b74c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42aa9e0d 90cd1955

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ java_defaults { 
        ":android.security.flags-aconfig-java{.generated_srcjars}",

        ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

        ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

        ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

        ":com.android.text.flags-aconfig-java{.generated_srcjars}",

    ],

    // Add aconfig-annotations-lib as a dependency for the optimization
@@ -61,6 +62,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Input

aconfig_declarations {

    name: "com.android.hardware.input.input-aconfig",

    package: "com.android.hardware.input",

    srcs: ["core/java/android/hardware/input/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.hardware.input-aconfig-java",

    aconfig_declarations: "com.android.hardware.input.input-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Text

aconfig_declarations {

    name: "com.android.text.flags-aconfig",

core/java/android/hardware/input/input_framework.aconfig

0 → 100644
+19 −0
Original line number Diff line number Diff line 
package: "com.android.hardware.input"



# Project link: https://gantry.corp.google.com/projects/android_platform_input_native/changes



flag {

    namespace: "input_native"

    name: "keyboard_layout_preview_flag"

    description: "Controls whether a preview will be shown in Settings when selecting a physical keyboard layout"

    bug: "293579375"

}





flag {

    namespace: "input_native"

    name: "keyboard_a11y_sticky_keys_flag"

    description: "Controls if the sticky keys accessibility feature for physical keyboard is available to the user"

    bug: "294546335"

}

core/tests/coretests/src/android/hardware/input/InputFlagsTest.java

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.input;



import static com.android.hardware.input.Flags.keyboardA11yStickyKeysFlag;

import static com.android.hardware.input.Flags.keyboardLayoutPreviewFlag;



import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Tests for {@link com.android.hardware.input.Flags}

 *

 * Build/Install/Run:

 *  atest FrameworksCoreTests:InputFlagsTest

 */

@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class InputFlagsTest {



    /**

     * Test that the flags work

     */

    @Test

    public void testFlags() {

        // No crash when accessing the flag.

        keyboardLayoutPreviewFlag();

        keyboardA11yStickyKeysFlag();

    }

}