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

Commit f7a83d55 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Use non-bold text for Arabic and Thai keyboard" into jb-mr1-dev

parents 1e11c44d d20652c8

java/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
        <attr name="shadowRadius" format="float" />

        <attr name="backgroundDimAlpha" format="integer" />



        <attr name="keyTextStyle" format="enum">

        <attr name="keyTypeface" format="enum">

            <!-- This should be aligned with Typeface.NORMAL etc. -->

            <enum name="normal" value="0" />

            <enum name="bold" value="1" />

java/res/values/styles.xml

+4 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
        <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>

        <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>

        <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>

        <item name="keyTextStyle">normal</item>

        <item name="keyTypeface">normal</item>

        <item name="keyTextColor">#FFFFFFFF</item>

        <item name="keyTextInactivatedColor">#FFFFFFFF</item>

        <item name="keyHintLetterColor">#80000000</item>
@@ -243,7 +243,7 @@ 
        name="KeyboardView.Stone.Bold"

        parent="KeyboardView.Stone"

    >

        <item name="keyTextStyle">bold</item>

        <item name="keyTypeface">bold</item>

    </style>

    <style

        name="MainKeyboardView.Stone.Bold"
@@ -272,7 +272,7 @@ 
    >

        <item name="android:background">@drawable/keyboard_dark_background</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_gingerbread</item>

        <item name="keyTextStyle">bold</item>

        <item name="keyTypeface">bold</item>

    </style>

    <style

        name="MainKeyboardView.Gingerbread"
@@ -317,7 +317,7 @@ 
    >

        <item name="android:background">@drawable/keyboard_background_holo</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>

        <item name="keyTextStyle">bold</item>

        <item name="keyTypeface">bold</item>

        <item name="keyTextInactivatedColor">#66E0E4E5</item>

        <item name="keyHintLetterColor">#80000000</item>

        <item name="keyHintLabelColor">#A0FFFFFF</item>

java/res/xml-sw600dp-land/kbd_thai.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    latin:rowHeight="20%p"

    latin:verticalGap="3.20%p"

    latin:keyTypeface="normal"

    latin:touchPositionCorrectionData="@null"

>

    <include

java/res/xml-sw600dp/kbd_thai.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    latin:rowHeight="20%p"

    latin:verticalGap="3.20%p"

    latin:keyTypeface="normal"

    latin:touchPositionCorrectionData="@null"

>

    <include

java/res/xml-sw768dp-land/kbd_thai.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    latin:rowHeight="20%p"

    latin:verticalGap="2.65%p"

    latin:keyTypeface="normal"

    latin:touchPositionCorrectionData="@null"

>

    <include