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

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

am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate...

am 908a2f63: Merge "Special handling of one key mini-keyboard to mitigate visual flicker" into ics-mr0

* commit '908a2f63':
  Special handling of one key mini-keyboard to mitigate visual flicker
parents 75c4b5fe 908a2f63
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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>
    <dimen name="keyboard_key_feedback_background_holo_width">46.67dp</dimen>
    <dimen name="keyboard_key_feedback_background_holo_height">58.67dp</dimen>
</resources>
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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>
    <dimen name="keyboard_key_feedback_background_holo_width">46dp</dimen>
    <dimen name="keyboard_key_feedback_background_holo_height">58dp</dimen>
</resources>
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, 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>
    <dimen name="keyboard_key_feedback_background_holo_width">47dp</dimen>
    <dimen name="keyboard_key_feedback_background_holo_height">57dp</dimen>
</resources>
+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@
        <attr name="keyPreviewLeftBackground" format="reference" />
        <!-- The background for the right edge key press feedback. -->
        <attr name="keyPreviewRightBackground" format="reference" />
        <!-- The width of rectangle part of the key press feedback background. -->
        <attr name="keyPreviewBackgroundWidth" format="dimension" />
        <!-- The height of rectangle part of the key press feedback background. -->
        <attr name="keyPreviewBackgroundHeight" format="dimension" />
        <!-- The text color for key press feedback. -->
        <attr name="keyPreviewTextColor" format="color" />
        <!-- Vertical offset of the key press feedback from the key. -->
+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@
        <item name="keyPreviewBackground">@drawable/keyboard_key_feedback_ics</item>
        <item name="keyPreviewLeftBackground">@drawable/keyboard_key_feedback_left_ics</item>
        <item name="keyPreviewRightBackground">@drawable/keyboard_key_feedback_right_ics</item>
        <item name="keyPreviewBackgroundWidth">@dimen/keyboard_key_feedback_background_holo_width</item>
        <item name="keyPreviewBackgroundHeight">@dimen/keyboard_key_feedback_background_holo_height</item>
        <item name="keyPreviewTextColor">#FFFFFFFF</item>
        <item name="keyPreviewHeight">@dimen/key_preview_height_ics</item>
        <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
Loading