From da4bfbbbb3d3aa5dce8f0507d3f3b07ea3e0f26f Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 6 Apr 2011 13:54:37 +0900
Subject: [PATCH] Fix popup key preview on tablet
This change temporally enable popup key preview option on
tablet. (config_enable_show_popup_on_keypress_option).
Bug: 3286117
Change-Id: Iabbac5a333460e1ed2f8d05ba82f4bae81854b85
---
...eyboard_key_feedback_background_holo.9.png | Bin 136 -> 4040 bytes
...eyboard_key_feedback_background_holo.9.png | Bin 1004 -> 3804 bytes
.../keyboard_key_feedback_honeycomb.xml | 2 +-
.../keyboard_popup_honeycomb.xml | 41 ------------------
java/res/layout/input_honeycomb.xml | 2 +
java/res/layout/key_preview_honeycomb.xml | 2 +-
java/res/layout/keyboard_popup.xml | 9 ++--
java/res/layout/keyboard_popup_honeycomb.xml | 9 ++--
java/res/values-xlarge-land/dimens.xml | 7 +--
java/res/values-xlarge/config.xml | 3 +-
java/res/values-xlarge/dimens.xml | 9 ++--
java/res/values/colors.xml | 1 -
java/res/values/dimens.xml | 17 +++++---
.../inputmethod/keyboard/KeyboardView.java | 2 +-
.../inputmethod/keyboard/LatinKeyboard.java | 2 +-
.../keyboard/SlidingLocaleDrawable.java | 2 +-
16 files changed, 36 insertions(+), 72 deletions(-)
delete mode 100644 java/res/layout-xlarge/keyboard_popup_honeycomb.xml
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
index 943f9e4bcdab341c94ce1c4cf28e91f7da34c1b7..8d6acacfb49c457061fe5a6a90980d6122ddfa33 100644
GIT binary patch
literal 4040
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
delta 121
zcmX>h-@$0u8Q|y6%O%Cdz`(%k>ERLtq**|igAGWo{5Y=;#3^?24B-HR8jh5XiFy+D
zTAnVBAsjPHPjBR9P~c%PWcE(^|8f&cm6XeIPd$I36R8TJTNm!W{^g}EyHFSRpUp{f
RTY$zec)I$ztaD0e0s!14B5?o!
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
index a7acb4a4dd366d9f47e6e1bd30ab67f189bcdad9..286cf84fc3fe12e63516ae11cf844f1e824b88ec 100644
GIT binary patch
delta 3067
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
F{|6wJT($rJ
delta 269
zcmca3`-a`EGr-TCmrII^fq{Y7)59eQNHc>l2OE$K)7ZKnNJ*BsMwA5Sr<If^7Ns&c
zrsOB3DtP85rl$s_CZ<#to=mmbs3*!4ZQ^QT=4fH+W@6-IXz1c*;p$@HW@PB-W@G`B
zaWYm?sK_nw^|kWMD=taQOHTE4u~h<!=w)W6SQ$d}n&8qqc^*@Of`O@pfuW(fiGjJ1
zftiJ&p@q4jo1>Yjo2#j_qlJO1^JF>ZI*ZOVi+2H?EaU0o7*cU7>Bs;7_RIneoCeNL
iPLKGz7&;g@3>eOy;IPw+y>tbrj=|H_&t;ucLK6TqCrXF_
diff --git a/java/res/drawable/keyboard_key_feedback_honeycomb.xml b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
index dd9b53e463..a3ea140cdb 100644
--- a/java/res/drawable/keyboard_key_feedback_honeycomb.xml
+++ b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
@@ -16,6 +16,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_long_pressable="true"
- android:drawable="@drawable/keyboard_key_feedback_more_background" />
+ android:drawable="@drawable/keyboard_key_feedback_more_background_holo" />
<item android:drawable="@drawable/keyboard_key_feedback_background_holo" />
</selector>
diff --git a/java/res/layout-xlarge/keyboard_popup_honeycomb.xml b/java/res/layout-xlarge/keyboard_popup_honeycomb.xml
deleted file mode 100644
index 0b8229ca5f..0000000000
--- a/java/res/layout-xlarge/keyboard_popup_honeycomb.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/keyboard_popup_panel_background_holo"
- android:paddingLeft="40dip"
- android:paddingRight="40dip"
- >
- <com.android.inputmethod.keyboard.KeyboardView
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/KeyboardView"
- android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/latinkeyboard_transparent"
-
- latin:keyBackground="@drawable/btn_keyboard_key_honeycomb_popup"
- latin:keyHysteresisDistance="0dip"
- latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"
- />
-</LinearLayout>
diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml
index 6ccc63c2b4..96b10b7ccf 100644
--- a/java/res/layout/input_honeycomb.xml
+++ b/java/res/layout/input_honeycomb.xml
@@ -31,6 +31,8 @@
latin:keyBackground="@drawable/btn_keyboard_key_honeycomb"
latin:keyPreviewLayout="@layout/key_preview_honeycomb"
+ latin:keyPreviewHeight="@dimen/key_preview_height_holo"
+ latin:keyPreviewOffset="@dimen/key_preview_offset_holo"
latin:popupLayout="@layout/keyboard_popup_honeycomb"
latin:keyTextColorDisabled="#FF63666D"
latin:keyLetterStyle="bold"
diff --git a/java/res/layout/key_preview_honeycomb.xml b/java/res/layout/key_preview_honeycomb.xml
index a90fe55885..2fbfbb517c 100644
--- a/java/res/layout/key_preview_honeycomb.xml
+++ b/java/res/layout/key_preview_honeycomb.xml
@@ -23,7 +23,7 @@
android:layout_height="80sp"
android:textSize="40sp"
android:textColor="@color/latinkeyboard_key_color_white"
- android:minWidth="24dip"
+ android:minWidth="32dip"
android:gravity="center"
android:background="@drawable/keyboard_key_feedback_honeycomb"
/>
diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/keyboard_popup.xml
index ac8134bfb1..013662240f 100644
--- a/java/res/layout/keyboard_popup.xml
+++ b/java/res/layout/keyboard_popup.xml
@@ -19,20 +19,19 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/keyboard_popup_panel_background"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingLeft="@dimen/mini_keyboard_horizontal_padding"
+ android:paddingRight="@dimen/mini_keyboard_horizontal_padding"
>
<com.android.inputmethod.keyboard.KeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/KeyboardView"
android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@color/latinkeyboard_transparent"
latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
latin:keyHysteresisDistance="0dip"
diff --git a/java/res/layout/keyboard_popup_honeycomb.xml b/java/res/layout/keyboard_popup_honeycomb.xml
index e5fcbd44c2..96c519dd41 100644
--- a/java/res/layout/keyboard_popup_honeycomb.xml
+++ b/java/res/layout/keyboard_popup_honeycomb.xml
@@ -19,20 +19,19 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/keyboard_popup_panel_background_holo"
- android:paddingLeft="24dip"
- android:paddingRight="24dip"
+ android:paddingLeft="@dimen/mini_keyboard_horizontal_padding_holo"
+ android:paddingRight="@dimen/mini_keyboard_horizontal_padding_holo"
>
<com.android.inputmethod.keyboard.KeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
android:id="@+id/KeyboardView"
android:layout_alignParentBottom="true"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@color/latinkeyboard_transparent"
latin:keyBackground="@drawable/btn_keyboard_key_honeycomb_popup"
latin:keyHysteresisDistance="0dip"
diff --git a/java/res/values-xlarge-land/dimens.xml b/java/res/values-xlarge-land/dimens.xml
index 625dd263c6..ba42ddde6a 100644
--- a/java/res/values-xlarge-land/dimens.xml
+++ b/java/res/values-xlarge-land/dimens.xml
@@ -19,7 +19,7 @@
-->
<resources>
- <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->
+ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=14.5mm -->
<dimen name="keyboardHeight">58.0mm</dimen>
<!-- key_height + key_bottom_gap = popup_key_height -->
<!-- <dimen name="key_height">14.5mm</dimen> -->
@@ -28,12 +28,13 @@
<dimen name="popup_key_height">13.0mm</dimen>
<dimen name="keyboard_top_padding">1.1mm</dimen>
<dimen name="keyboard_bottom_padding">0.0mm</dimen>
- <!-- key_height x 1.0 -->
- <dimen name="key_preview_height">13.0mm</dimen>
<dimen name="key_letter_size">28dip</dimen>
<dimen name="key_label_text_size">20dip</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">18dip</dimen>
+ <dimen name="key_preview_height_holo">26.5mm</dimen>
+ <dimen name="key_preview_offset_holo">7.5mm</dimen>
+
<dimen name="candidate_strip_padding">40.0mm</dimen>
</resources>
diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml
index f075b1b508..ed8dc3e520 100644
--- a/java/res/values-xlarge/config.xml
+++ b/java/res/values-xlarge/config.xml
@@ -22,7 +22,8 @@
<bool name="config_enable_show_settings_key_option">false</bool>
<bool name="config_enable_show_subtype_settings">false</bool>
<bool name="config_enable_show_voice_key_option">false</bool>
- <bool name="config_enable_show_popup_on_keypress_option">false</bool>
+ <!-- TODO: This configuration value is temporary set true to check popup preview behavior. -->
+ <bool name="config_enable_show_popup_on_keypress_option">true</bool>
<bool name="config_enable_show_recorrection_option">false</bool>
<bool name="config_enable_quick_fixes_option">false</bool>
<bool name="config_enable_bigram_suggestions_option">false</bool>
diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
index 69283202e6..cdb6e89a48 100644
--- a/java/res/values-xlarge/dimens.xml
+++ b/java/res/values-xlarge/dimens.xml
@@ -19,7 +19,7 @@
-->
<resources>
- <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->
+ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=12mm -->
<dimen name="keyboardHeight">48.0mm</dimen>
<!-- key_height + key_bottom_gap = popup_key_height -->
<!-- <dimen name="key_height">14.5mm</dimen> -->
@@ -28,8 +28,7 @@
<dimen name="popup_key_height">10.0mm</dimen>
<dimen name="keyboard_top_padding">1.1mm</dimen>
<dimen name="keyboard_bottom_padding">0.0mm</dimen>
- <!-- key_height x 1.0 -->
- <dimen name="key_preview_height">13.0mm</dimen>
+ <dimen name="mini_keyboard_horizontal_padding_holo">40dip</dimen>
<dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
@@ -39,9 +38,11 @@
<dimen name="key_letter_size">26dip</dimen>
<dimen name="key_label_text_size">16dip</dimen>
- <dimen name="key_preview_text_size_large">24dip</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">6dip</dimen>
+ <dimen name="key_preview_text_size_large">24dip</dimen>
+ <dimen name="key_preview_height_holo">23.0mm</dimen>
+ <dimen name="key_preview_offset_holo">8.0mm</dimen>
<dimen name="candidate_strip_height">46dip</dimen>
<dimen name="candidate_strip_padding">15.0mm</dimen>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 0161589a45..5e9d63203d 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -21,7 +21,6 @@
<color name="candidate_normal">#FFFFFFFF</color>
<color name="candidate_recommended">#FFFCAE00</color>
<color name="candidate_other">#FFFCAE00</color>
- <color name="latinkeyboard_transparent">#00000000</color>
<color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
<color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
<color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 7f00cdba30..2cfc17de97 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -19,7 +19,7 @@
-->
<resources>
- <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->
+ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=0.290in -->
<dimen name="keyboardHeight">1.265in</dimen>
<!-- key_height + key_bottom_gap = popup_key_height -->
<!-- <dimen name="key_height">0.290in</dimen> -->
@@ -28,24 +28,27 @@
<dimen name="popup_key_height">0.325in</dimen>
<dimen name="keyboard_top_padding">0.00in</dimen>
<dimen name="keyboard_bottom_padding">0.06in</dimen>
- <!-- key_preview_text_size_large x 2 -->
- <dimen name="key_preview_height">80sp</dimen>
+ <dimen name="mini_keyboard_horizontal_padding">16dip</dimen>
+ <dimen name="mini_keyboard_horizontal_padding_holo">32dip</dimen>
<dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
<!-- popup_key_height x 1.2 -->
<dimen name="mini_keyboard_slide_allowance">0.390in</dimen>
<!-- popup_key_height x -1.0 -->
<dimen name="mini_keyboard_vertical_correction">-0.325in</dimen>
+ <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
+ to user's finger. -->
+ <dimen name="keyboard_vertical_correction">-0.05in</dimen>
<dimen name="key_letter_size">0.13in</dimen>
<dimen name="key_label_text_size">0.083in</dimen>
- <dimen name="key_preview_text_size_large">40sp</dimen>
<!-- left or right padding of label alignment -->
<dimen name="key_label_horizontal_alignment_padding">0.13in</dimen>
+ <dimen name="key_preview_height">80sp</dimen>
<dimen name="key_preview_offset">0.000in</dimen>
- <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
- to user's finger. -->
- <dimen name="keyboard_vertical_correction">-0.05in</dimen>
+ <dimen name="key_preview_text_size_large">36sp</dimen>
+ <dimen name="key_preview_height_holo">130sp</dimen>
+ <dimen name="key_preview_offset_holo">0.193in</dimen>
<dimen name="candidate_strip_height">42dip</dimen>
<dimen name="candidate_strip_fading_edge_length">63dip</dimen>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 61af15b1d9..cc14589f6a 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -37,7 +37,6 @@ import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-import android.provider.Settings;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
@@ -378,6 +377,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
}
mPreviewPopup.setTouchable(false);
mPreviewPopup.setAnimationStyle(R.style.KeyPreviewAnimation);
+ mPreviewPopup.setClippingEnabled(false);
mDelayBeforePreview = res.getInteger(R.integer.config_delay_before_preview);
mDelayAfterPreview = res.getInteger(R.integer.config_delay_after_preview);
mKeyLabelHorizontalPadding = (int)res.getDimension(
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
index 5820049bb8..9b87df3fee 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
@@ -229,7 +229,7 @@ public class LatinKeyboard extends Keyboard {
final Bitmap buffer = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
final Canvas canvas = new Canvas(buffer);
final Resources res = mContext.getResources();
- canvas.drawColor(res.getColor(R.color.latinkeyboard_transparent), PorterDuff.Mode.CLEAR);
+ canvas.drawColor(res.getColor(android.R.color.transparent), PorterDuff.Mode.CLEAR);
SubtypeSwitcher subtypeSwitcher = SubtypeSwitcher.getInstance();
// If application locales are explicitly selected.
diff --git a/java/src/com/android/inputmethod/keyboard/SlidingLocaleDrawable.java b/java/src/com/android/inputmethod/keyboard/SlidingLocaleDrawable.java
index 41f8c2a7cd..eee0ac61b8 100644
--- a/java/src/com/android/inputmethod/keyboard/SlidingLocaleDrawable.java
+++ b/java/src/com/android/inputmethod/keyboard/SlidingLocaleDrawable.java
@@ -63,7 +63,7 @@ public class SlidingLocaleDrawable extends Drawable {
mHeight = height;
final TextPaint textPaint = new TextPaint();
textPaint.setTextSize(getTextSizeFromTheme(android.R.style.TextAppearance_Medium, 18));
- textPaint.setColor(R.color.latinkeyboard_transparent);
+ textPaint.setColor(android.R.color.transparent);
textPaint.setTextAlign(Align.CENTER);
textPaint.setAlpha(LatinKeyboard.OPACITY_FULLY_OPAQUE);
textPaint.setAntiAlias(true);
--
GitLab