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

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

Revert "Prepare for changing text color for functional keys" 

This reverts commit 194e004e.
Bug: 10786040

Change-Id: I4c5287d46cabe287abce5cba77635cf26d2cd192
parent 584e9c9c

java/res/color/key_text_color_holo.xml

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

<!-- Copyright (C) 2013 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.

-->



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

    <!-- Functional keys. -->

    <item android:state_single="true" android:state_pressed="true"

          android:color="@color/key_text_color_functional_holo" />

    <item android:state_single="true"

          android:color="@color/key_text_color_functional_holo" />



    <!-- Action keys. -->

    <item android:state_active="true" android:state_pressed="true"

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_active="true"

          android:color="@color/key_text_color_normal_holo" />



    <!-- Toggle keys. Use checkable/checked state. -->

    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_checkable="true" android:state_pressed="true"

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_checkable="true" android:state_checked="true"

          android:color="@color/key_text_color_normal_holo" />

    <item android:state_checkable="true"

          android:color="@color/key_text_color_normal_holo" />



    <!-- Empty background keys. -->

    <item android:state_empty="true"

          android:color="@color/key_text_color_normal_holo" />



    <!-- Normal keys. -->

    <item android:state_pressed="true"

          android:color="@color/key_text_color_normal_holo" />

    <item android:color="@color/key_text_color_normal_holo" />

</selector>

java/res/values/colors.xml

+1 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
    <color name="typed_word_color_ics">#D833B5E5</color>

    <color name="suggested_word_color_ics">#B233B5E5</color>

    <color name="highlight_translucent_color_ics">#9933B5E5</color>

    <color name="key_text_color_holo">@android:color/white</color>

    <color name="key_text_shadow_color_holo">@android:color/transparent</color>

    <color name="key_text_inactivated_color_holo">#66E0E4E5</color>

    <color name="key_hint_letter_color_holo">#80000000</color>
@@ -65,7 +66,4 @@ 
    <!-- TODO: Color which should be included in the theme -->

    <color name="emoji_key_background_color">#00000000</color>

    <color name="emoji_key_pressed_background_color">#30FFFFFF</color>



    <color name="key_text_color_normal_holo">@android:color/white</color>

    <color name="key_text_color_functional_holo">@android:color/white</color>

</resources>

java/src/com/android/inputmethod/keyboard/Key.java

+1 −18
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ public class Key implements Comparable<Key> { 


    private final OptionalAttributes mOptionalAttributes;



    private static final int DEFAULT_TEXT_COLOR = 0xFFFFFFFF;



    private static final class OptionalAttributes {

        /** Text to output when pressed. This can be multiple characters, like ".com" */

        public final String mOutputText;
@@ -585,22 +583,7 @@ public class Key implements Comparable<Key> { 
    }



    public final int selectTextColor(final KeyDrawParams params) {

        if (isShiftedLetterActivated()) {

            return params.mTextInactivatedColor;

        }

        if (params.mTextColorStateList == null) {

            return DEFAULT_TEXT_COLOR;

        }

        final int[] state;

        // TODO: Hack!!!!!!!! Consider having a new attribute for the functional text labels.

        // Currently, we distinguish "input key" from "functional key" by checking the

        // length of the label( > 1) and "functional" attributes (= true).

        if (mLabel != null && mLabel.length() > 1) {

            state = getCurrentDrawableState();

        } else {

            state = KEY_STATE_NORMAL;

        }

        return params.mTextColorStateList.getColorForState(state, DEFAULT_TEXT_COLOR);

        return isShiftedLetterActivated() ? params.mTextInactivatedColor : params.mTextColor;

    }



    public final int selectHintTextSize(final KeyDrawParams params) {

java/src/com/android/inputmethod/keyboard/internal/KeyDrawParams.java

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


package com.android.inputmethod.keyboard.internal;



import android.content.res.ColorStateList;

import android.graphics.Typeface;



import com.android.inputmethod.latin.utils.ResourceUtils;
@@ -33,7 +32,7 @@ public final class KeyDrawParams { 
    public int mHintLabelSize;

    public int mPreviewTextSize;



    public ColorStateList mTextColorStateList;

    public int mTextColor;

    public int mTextInactivatedColor;

    public int mTextShadowColor;

    public int mHintLetterColor;
@@ -58,7 +57,7 @@ public final class KeyDrawParams { 
        mHintLabelSize = copyFrom.mHintLabelSize;

        mPreviewTextSize = copyFrom.mPreviewTextSize;



        mTextColorStateList = copyFrom.mTextColorStateList;

        mTextColor = copyFrom.mTextColor;

        mTextInactivatedColor = copyFrom.mTextInactivatedColor;

        mTextShadowColor = copyFrom.mTextShadowColor;

        mHintLetterColor = copyFrom.mHintLetterColor;
@@ -90,8 +89,8 @@ public final class KeyDrawParams { 
                attr.mShiftedLetterHintRatio, mShiftedLetterHintSize);

        mHintLabelSize = selectTextSize(keyHeight, attr.mHintLabelRatio, mHintLabelSize);

        mPreviewTextSize = selectTextSize(keyHeight, attr.mPreviewTextRatio, mPreviewTextSize);

        mTextColorStateList =

                attr.mTextColorStateList != null ? attr.mTextColorStateList : mTextColorStateList;



        mTextColor = selectColor(attr.mTextColor, mTextColor);

        mTextInactivatedColor = selectColor(attr.mTextInactivatedColor, mTextInactivatedColor);

        mTextShadowColor = selectColor(attr.mTextShadowColor, mTextShadowColor);

        mHintLetterColor = selectColor(attr.mHintLetterColor, mHintLetterColor);

java/src/com/android/inputmethod/keyboard/internal/KeyVisualAttributes.java

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


package com.android.inputmethod.keyboard.internal;



import android.content.res.ColorStateList;

import android.content.res.TypedArray;

import android.graphics.Typeface;

import android.util.SparseIntArray;
@@ -38,7 +37,7 @@ public final class KeyVisualAttributes { 
    public final float mHintLabelRatio;

    public final float mPreviewTextRatio;



    public final ColorStateList mTextColorStateList;

    public final int mTextColor;

    public final int mTextInactivatedColor;

    public final int mTextShadowColor;

    public final int mHintLetterColor;
@@ -119,7 +118,7 @@ public final class KeyVisualAttributes { 
        mPreviewTextRatio = ResourceUtils.getFraction(keyAttr,

                R.styleable.Keyboard_Key_keyPreviewTextRatio);



        mTextColorStateList = keyAttr.getColorStateList(R.styleable.Keyboard_Key_keyTextColor);

        mTextColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextColor, 0);

        mTextInactivatedColor = keyAttr.getColor(

                R.styleable.Keyboard_Key_keyTextInactivatedColor, 0);

        mTextShadowColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextShadowColor, 0);