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

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

Merge "Fix system provided KCMs" into main

parents 55307861 81b0c255

core/java/android/hardware/input/KeyboardLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ public final class KeyboardLayout implements Parcelable, Comparable<KeyboardLayo 
        DVORAK(4, LAYOUT_TYPE_DVORAK),

        COLEMAK(5, LAYOUT_TYPE_COLEMAK),

        WORKMAN(6, LAYOUT_TYPE_WORKMAN),

        TURKISH_F(7, LAYOUT_TYPE_TURKISH_F),

        TURKISH_Q(8, LAYOUT_TYPE_TURKISH_Q),

        TURKISH_Q(7, LAYOUT_TYPE_TURKISH_Q),

        TURKISH_F(8, LAYOUT_TYPE_TURKISH_F),

        EXTENDED(9, LAYOUT_TYPE_EXTENDED);



        private final int mValue;

packages/InputDevices/res/raw/keyboard_layout_persian.kcm

+1 −3
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.







type FULL

type OVERLAY



### Basic QWERTY keys ###

packages/InputDevices/res/xml/keyboard_layouts.xml

+0 −7
Original line number Diff line number Diff line
@@ -222,13 +222,6 @@ 
        android:keyboardLocale="sl-Latn"

        android:keyboardLayoutType="qwertz" />



    <keyboard-layout

        android:name="keyboard_layout_turkish"

        android:label="@string/keyboard_layout_turkish"

        android:keyboardLayout="@raw/keyboard_layout_turkish"

        android:keyboardLocale="tr-Latn"

        android:keyboardLayoutType="qwerty" />



    <keyboard-layout

        android:name="keyboard_layout_turkish"

        android:label="@string/keyboard_layout_turkish"