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

Commit 5c26922a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Move themeId and touch correction data to Keyboard style 

Change-Id: I13b9997e013b704734b6fa94131b1f7fec7a152d
parent 9ee8c9c4

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


<resources>

    <declare-styleable name="KeyboardTheme">

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

        <!-- Keyboard style -->

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

        <!-- LatinKeyboard style -->
@@ -34,8 +33,6 @@ 
        <attr name="moreSuggestionsViewStyle" format="reference" />

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

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

        <!-- Touch position correction -->

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

    </declare-styleable>



    <declare-styleable name="KeyboardView">
@@ -140,6 +137,9 @@ 
    </declare-styleable>



    <declare-styleable name="Keyboard">

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

        <!-- Touch position correction -->

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

        <!-- Default keyboard height -->

        <attr name="keyboardHeight" format="dimension|fraction" />

        <!-- Maximum keyboard height, in pixels or percentage of display height -->

java/res/values/styles.xml

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
<resources>

    <!-- Theme "Basic" -->

    <style name="Keyboard">

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

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_empty</item>

        <item name="rowHeight">25%p</item>

        <item name="keyboardHeight">@dimen/keyboardHeight</item>

        <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
@@ -118,6 +120,12 @@ 
        <item name="android:background">@drawable/suggestion_feedback_background</item>

    </style>

    <!-- Theme "Basic high contrast" -->

    <style

        name="Keyboard.HighContrast"

        parent="Keyboard"

    >

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

    </style>

    <style

        name="KeyboardView.HighContrast"

        parent="KeyboardView"
@@ -130,6 +138,7 @@ 
        name="Keyboard.Stone"

        parent="Keyboard"

    >

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

        <item name="keyboardHeight">@dimen/keyboardHeight_stone</item>

        <item name="keyboardTopPadding">@fraction/keyboard_top_padding_stone</item>

        <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_stone</item>
@@ -173,6 +182,12 @@ 
        <item name="shadowColor">#FFFFFFFF</item>

    </style>

    <!-- Theme "Stone bold" -->

    <style

        name="Keyboard.Stone.Bold"

        parent="Keyboard.Stone"

    >

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

    </style>

    <style

        name="KeyboardView.Stone.Bold"

        parent="KeyboardView.Stone"
@@ -184,6 +199,8 @@ 
        name="Keyboard.Gingerbread"

        parent="Keyboard"

    >

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

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gingerbread</item>

        <item name="horizontalGap">@fraction/key_horizontal_gap_gb</item>

        <item name="verticalGap">@fraction/key_bottom_gap_gb</item>

    </style>
@@ -214,10 +231,12 @@ 
        name="Keyboard.IceCreamSandwich"

        parent="Keyboard"

    >

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

        <item name="keyboardTopPadding">@fraction/keyboard_top_padding_ics</item>

        <item name="keyboardBottomPadding">@fraction/keyboard_bottom_padding_ics</item>

        <item name="horizontalGap">@fraction/key_horizontal_gap_ics</item>

        <item name="verticalGap">@fraction/key_bottom_gap_ics</item>

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_ice_cream_sandwich</item>

    </style>

    <style

        name="LatinKeyboard.IceCreamSandwich"

java/res/values/themes-basic-highcontrast.xml

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


<resources>

    <style name="KeyboardTheme.HighContrast" parent="KeyboardIcons">

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

        <item name="keyboardStyle">@style/Keyboard</item>

        <item name="keyboardStyle">@style/Keyboard.HighContrast</item>

        <item name="latinKeyboardStyle">@style/LatinKeyboard</item>

        <item name="keyboardViewStyle">@style/KeyboardView.HighContrast</item>

        <item name="miniKeyboardStyle">@style/MiniKeyboard</item>
@@ -28,6 +27,5 @@ 
        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_empty</item>

    </style>

</resources>

java/res/values/themes-basic.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


<resources>

    <style name="KeyboardTheme" parent="KeyboardIcons">

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

        <item name="keyboardStyle">@style/Keyboard</item>

        <item name="latinKeyboardStyle">@style/LatinKeyboard</item>

        <item name="keyboardViewStyle">@style/KeyboardView</item>
@@ -28,6 +27,5 @@ 
        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_empty</item>

    </style>

</resources>

java/res/values/themes-gingerbread.xml

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


<resources>

    <style name="KeyboardTheme.Gingerbread" parent="KeyboardIcons">

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

        <item name="keyboardStyle">@style/Keyboard.Gingerbread</item>

        <item name="latinKeyboardStyle">@style/LatinKeyboard</item>

        <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item>
@@ -28,6 +27,5 @@ 
        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="touchPositionCorrectionData">@array/touch_position_correction_data_gingerbread</item>

    </style>

</resources>