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

Commit 2a7a5740 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 0af2472a: Add new "keyboardTheme" <case> predicator 

* commit '0af2472a':
  Add new "keyboardTheme" <case> predicator
parents f2c509a8 0af2472a

java/res/values/attrs.xml

+14 −1
Original line number Diff line number Diff line
@@ -207,7 +207,13 @@ 
    </declare-styleable>



    <declare-styleable name="Keyboard">

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

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

            <!-- This should be aligned with KeyboardTheme.THEME_ID_*. -->

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

            <enum name="KLP" value="2" />

            <enum name="LXXLight" value="3" />

            <enum name="LXXDark" value="4" />

        </attr>

        <!-- Touch position correction -->

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

        <!-- Keyboard top, bottom, left, right edges paddings, in propotion of keyboard height. -->
@@ -427,6 +433,13 @@ 
            <enum name="emojiCategory5" value="15" />

            <enum name="emojiCategory6" value="16" />

        </attr>

        <!-- This should be aligned with Keyboard.themeId and KeyboardTheme.THEME_ID_* -->

        <attr name="keyboardTheme" format="enum|string">

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

            <enum name="KLP" value="2" />

            <enum name="LXXLight" value="3" />

            <enum name="LXXDark" value="4" />

        </attr>

        <!-- This should be aligned with KeyboardId.MODE_* -->

        <attr name="mode" format="enum|string">

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

java/res/values/themes-ics.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
        name="Keyboard.ICS"

        parent="Keyboard"

    >

        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->

        <item name="themeId">2</item>

        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->

        <item name="themeId">ICS</item>

    </style>

    <style

        name="KeyboardView.ICS"

java/res/values/themes-klp.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
        name="Keyboard.KLP"

        parent="Keyboard"

    >

        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->

        <item name="themeId">0</item>

        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->

        <item name="themeId">KLP</item>

    </style>

    <style

        name="KeyboardView.KLP"

java/res/values/themes-lxx-dark.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
        name="Keyboard.LXX_Dark"

        parent="Keyboard"

    >

        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->

        <item name="themeId">4</item>

        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->

        <item name="themeId">LXXDark</item>

    </style>

    <style

        name="KeyboardView.LXX_Dark"

java/res/values/themes-lxx-light.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
        name="Keyboard.LXX_Light"

        parent="Keyboard"

    >

        <!-- This should be aligned with KeyboardSwitcher.KEYBOARD_THEMES[] -->

        <item name="themeId">3</item>

        <!-- This should be aligned with KeyboardTheme.THEME_ID_* -->

        <item name="themeId">LXXLight</item>

    </style>

    <style

        name="KeyboardView.LXX_Light"