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

Commit 2f095760 authored by Jeff Brown's avatar Jeff Brown
Browse files

Rename kcm attribute to keyboardLayout. 

Bug: 6478076
Change-Id: I7fc0d8eb36d03a628d070f8fd6ea1e1464b1a163
parent 3816174b

api/16.txt

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ package android { 
    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d

    field public static final int itemTextAppearance = 16843052; // 0x101012c

    field public static final int kcm = 16843691; // 0x10103ab

    field public static final int keepScreenOn = 16843286; // 0x1010216

    field public static final int key = 16843240; // 0x10101e8

    field public static final int keyBackground = 16843315; // 0x1010233
@@ -608,6 +607,7 @@ package android { 
    field public static final int keyTextColor = 16843318; // 0x1010236

    field public static final int keyTextSize = 16843316; // 0x1010234

    field public static final int keyWidth = 16843325; // 0x101023d

    field public static final int keyboardLayout = 16843691; // 0x10103ab

    field public static final int keyboardMode = 16843341; // 0x101024d

    field public static final int keycode = 16842949; // 0x10100c5

    field public static final int killAfterRestore = 16843420; // 0x101029c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,6 @@ package android { 
    field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131

    field public static final int itemPadding = 16843565; // 0x101032d

    field public static final int itemTextAppearance = 16843052; // 0x101012c

    field public static final int kcm = 16843691; // 0x10103ab

    field public static final int keepScreenOn = 16843286; // 0x1010216

    field public static final int key = 16843240; // 0x10101e8

    field public static final int keyBackground = 16843315; // 0x1010233
@@ -609,6 +608,7 @@ package android { 
    field public static final int keyTextColor = 16843318; // 0x1010236

    field public static final int keyTextSize = 16843316; // 0x1010234

    field public static final int keyWidth = 16843325; // 0x101023d

    field public static final int keyboardLayout = 16843691; // 0x10103ab

    field public static final int keyboardMode = 16843341; // 0x101024d

    field public static final int keycode = 16842949; // 0x10100c5

    field public static final int killAfterRestore = 16843420; // 0x101029c

core/java/android/hardware/input/InputManager.java

+2 −2
Original line number Diff line number Diff line
@@ -96,14 +96,14 @@ public final class InputManager { 
     * <keyboard-layouts xmlns:android="http://schemas.android.com/apk/res/android">

     *     <keyboard-layout android:name="keyboard_layout_english_us"

     *             android:label="@string/keyboard_layout_english_us_label"

     *             android:kcm="@raw/keyboard_layout_english_us" />

     *             android:keyboardLayout="@raw/keyboard_layout_english_us" />

     * </keyboard-layouts>

     * </p><p>

     * The <code>android:name</code> attribute specifies an identifier by which

     * the keyboard layout will be known in the package.

     * The <code>android:label</code> attributes specifies a human-readable descriptive

     * label to describe the keyboard layout in the user interface, such as "English (US)".

     * The <code>android:kcm</code> attribute refers to a

     * The <code>android:keyboardLayout</code> attribute refers to a

     * <a href="http://source.android.com/tech/input/key-character-map-files.html">

     * key character map</a> resource that defines the keyboard layout.

     * </p>

core/res/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -5627,6 +5627,6 @@ 
        <!-- The display label of the keyboard layout. -->

        <attr name="label" />

        <!-- The key character map file resource. -->

        <attr name="kcm" format="reference" />

        <attr name="keyboardLayout" format="reference" />

    </declare-styleable>

</resources>

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -3603,7 +3603,7 @@ 
  <public type="attr" name="permissionGroupFlags" id="0x010103a8" />

  <public type="attr" name="isolatedProcess" id="0x010103a9" />

  <public type="attr" name="importantForAccessibility" id="0x010103aa" />

  <public type="attr" name="kcm" id="0x010103ab" />

  <public type="attr" name="keyboardLayout" id="0x010103ab" />

  <public type="attr" name="fontFamily" id="0x010103ac" />



</resources>