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

Commit 0d72a8db authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 0a4a2558: am 414e9470: Revert "Clean up Keyboard and KeyboardView theme" 

* commit '0a4a2558':
  Revert "Clean up Keyboard and KeyboardView theme"
parents c91c2d5e 0a4a2558

java/res/values/themes-common.xml

+3 −8
Original line number Diff line number Diff line
@@ -22,18 +22,15 @@ 
    <style name="KeyboardIcons" />

    <!-- Default theme values -->

    <style name="Keyboard">

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

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

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

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

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

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

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

        <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item>

        <item name="keyboardLeftPadding">@fraction/config_keyboard_left_padding</item>

        <item name="keyboardRightPadding">@fraction/config_keyboard_right_padding</item>

        <item name="moreKeysTemplate">@xml/kbd_more_keys_keyboard_template</item>

        <item name="maxMoreKeysColumn">@integer/config_max_more_keys_column</item>

    </style>

    <style name="KeyboardView">

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

        <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>

        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>

        <item name="keyLabelSize">@fraction/config_key_label_ratio</item>
@@ -42,8 +39,6 @@ 
        <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>

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

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

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyHintLetterPadding">@dimen/config_key_hint_letter_padding</item>

        <item name="keyPopupHintLetterPadding">@dimen/config_key_popup_hint_letter_padding</item>

        <item name="keyShiftedLetterHintPadding">@dimen/config_key_shifted_letter_hint_padding</item>

java/res/values/themes-holo.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Holo KeyboardView theme (ICS and KLP) -->

    <style

        name="KeyboardView.Holo"

        parent="KeyboardView"

    >

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

        <item name="keyLargeLetterRatio">@fraction/config_key_large_letter_ratio</item>

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

        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

        <item name="keyPopupHintLetter">&#x2026;</item>

    </style>

</resources>

java/res/values/themes-ics.xml

+11 −1
Original line number Diff line number Diff line
@@ -35,15 +35,21 @@ 
    >

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

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

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

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

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

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

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

    </style>

    <style

        name="KeyboardView.ICS"

        parent="KeyboardView.Holo"

        parent="KeyboardView"

    >

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

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

        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_ics</item>

        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_ics</item>

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

        <item name="keyTextColor">@color/key_text_color_holo</item>

        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>

        <item name="functionalTextColor">@color/key_text_color_holo</item>
@@ -52,6 +58,10 @@ 
        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>

        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

        <item name="keyPopupHintLetter">&#x2026;</item>

    </style>

    <style

        name="MainKeyboardView.ICS"

java/res/values/themes-klp.xml

+11 −1
Original line number Diff line number Diff line
@@ -35,15 +35,21 @@ 
    >

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

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

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

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

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

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

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

    </style>

    <style

        name="KeyboardView.KLP"

        parent="KeyboardView.Holo"

        parent="KeyboardView"

    >

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

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

        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_klp</item>

        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_klp</item>

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

        <item name="keyTextColor">@color/key_text_color_holo</item>

        <item name="keyTextInactivatedColor">@color/key_text_inactivated_color_holo</item>

        <item name="functionalTextColor">@color/key_text_color_holo</item>
@@ -52,6 +58,10 @@ 
        <item name="keyShiftedLetterHintInactivatedColor">@color/key_shifted_letter_hint_inactivated_color_holo</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_shifted_letter_hint_activated_color_holo</item>

        <item name="keyPreviewTextColor">@color/key_text_color_holo</item>

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->

        <item name="keyPopupHintLetter">&#x2026;</item>

    </style>

    <style

        name="MainKeyboardView.KLP"

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

+11 −1
Original line number Diff line number Diff line
@@ -35,15 +35,22 @@ 
    >

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

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

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

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

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

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

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

    </style>

    <style

        name="KeyboardView.LXX_Dark"

        parent="KeyboardView.LXX"

        parent="KeyboardView"

    >

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

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

        <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>

        <item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>

        <item name="spacebarIconWidthRatio">0.9</item>

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

        <item name="keyTextColor">@color/key_text_color_lxx_dark</item>

        <item name="keyTextInactivatedColor">@color/key_functional_text_color_lxx_dark</item>

        <item name="functionalTextColor">@color/key_text_color_lxx_dark</item>
@@ -52,6 +59,9 @@ 
        <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>

        <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>

        <item name="keyPreviewTextColor">@color/key_text_color_lxx_dark</item>

        <!-- A negative value to disable key text shadow layer. -->

        <item name="keyTextShadowRadius">-1.0</item>

        <item name="keyPopupHintLetter"></item> <!-- No popup hint letter -->

    </style>

    <style

        name="MainKeyboardView.LXX_Dark"