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

Commit 73a9932a authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge "Handle layout selection before onInputDeviceAdded()" into main

parents da32aebc dfb9d38c

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3527,6 +3527,8 @@ package android.view { 
    method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void disable();

    method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void enable();

    method @NonNull public android.hardware.input.InputDeviceIdentifier getIdentifier();

    method @Nullable public String getKeyboardLanguageTag();

    method @Nullable public String getKeyboardLayoutType();

  }



  public abstract class InputEvent implements android.os.Parcelable {

core/java/android/view/InputDevice.java

+2 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ public final class InputDevice implements Parcelable { 
     * @hide

     */

    @Nullable

    @TestApi

    public String getKeyboardLanguageTag() {

        return mKeyboardLanguageTag;

    }
@@ -968,6 +969,7 @@ public final class InputDevice implements Parcelable { 
     * @hide

     */

    @Nullable

    @TestApi

    public String getKeyboardLayoutType() {

        return mKeyboardLayoutType;

    }

services/core/java/com/android/server/input/InputManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -2725,11 +2725,12 @@ public class InputManagerService extends IInputManager.Stub 


    // Native callback.

    @SuppressWarnings("unused")

    private String[] getKeyboardLayoutOverlay(InputDeviceIdentifier identifier) {

    private String[] getKeyboardLayoutOverlay(InputDeviceIdentifier identifier, String languageTag,

            String layoutType) {

        if (!mSystemReady) {

            return null;

        }

        return mKeyboardLayoutManager.getKeyboardLayoutOverlay(identifier);

        return mKeyboardLayoutManager.getKeyboardLayoutOverlay(identifier, languageTag, layoutType);

    }



    @EnforcePermission(Manifest.permission.REMAP_MODIFIER_KEYS)