From 2b4cc0db61e7b5cf11552b6f0e444f254a8a7628 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 28 Sep 2010 14:35:21 +0900
Subject: [PATCH] Fix xlarge min-keyboard layout

Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0
---
 java/res/values-xlarge/dimens.xml          |  3 +++
 java/res/values/dimens.xml                 |  4 ++++
 java/res/values/styles.xml                 |  8 +++----
 java/res/xml-xlarge/kbd_popup_template.xml | 27 ++++++++++++++++++++++
 java/res/xml-xlarge/kbd_qwerty.xml         |  1 -
 java/res/xml-xlarge/kbd_symbols_shift.xml  |  1 -
 6 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 java/res/xml-xlarge/kbd_popup_template.xml

diff --git a/java/res/values-xlarge/dimens.xml b/java/res/values-xlarge/dimens.xml
index 37e6b9ef0..7c26729b1 100644
--- a/java/res/values-xlarge/dimens.xml
+++ b/java/res/values-xlarge/dimens.xml
@@ -23,5 +23,8 @@
     <dimen name="candidate_strip_height">46dip</dimen>
     <dimen name="spacebar_vertical_correction">0dip</dimen>
     <dimen name="key_text_size">28sp</dimen>
+    <dimen name="key_label_text_size">16sp</dimen>
+    <dimen name="key_preview_offset">0dip</dimen>
+    <dimen name="key_preview_height">40dip</dimen>
     <dimen name="keyboard_vertical_correction">0dip</dimen>
 </resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 75efddf6c..cad4e2ada 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -28,8 +28,12 @@
          will not go into extract (fullscreen) mode. -->
     <dimen name="max_height_for_fullscreen">2.5in</dimen>
     <dimen name="key_text_size">22sp</dimen>
+    <dimen name="key_label_text_size">14sp</dimen>
+    <dimen name="key_preview_offset">0dip</dimen>
+    <dimen name="key_preview_height">80dip</dimen>
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- key_height * 1.7 -->
     <dimen name="mini_keyboard_slide_allowance">91.8dip</dimen>
+    <dimen name="key_hysteresis_distance">0.05in</dimen>
     <dimen name="keyboard_vertical_correction">-10dip</dimen>
 </resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index f30c9f196..0372b07cf 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -22,11 +22,11 @@
         <item name="keyTextSize">@dimen/key_text_size</item>
         <item name="keyTextColor">#FFFFFFFF</item>
         <item name="keyPreviewLayout">@layout/key_preview</item>
-        <item name="keyPreviewOffset">0dip</item>
-        <item name="keyPreviewHeight">80dip</item>
-        <item name="labelTextSize">14sp</item>
+        <item name="keyPreviewOffset">@dimen/key_preview_offset</item>
+        <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+        <item name="labelTextSize">@dimen/key_label_text_size</item>
         <item name="popupLayout">@layout/keyboard_popup</item>
-        <item name="keyHysteresisDistance">0.05in</item>
+        <item name="keyHysteresisDistance">@dimen/key_hysteresis_distance</item>
         <item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
         <item name="shadowColor">#BB000000</item>
         <item name="shadowRadius">2.75</item>
diff --git a/java/res/xml-xlarge/kbd_popup_template.xml b/java/res/xml-xlarge/kbd_popup_template.xml
new file mode 100644
index 000000000..0e67a18d4
--- /dev/null
+++ b/java/res/xml-xlarge/kbd_popup_template.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:keyWidth="7.5%p"
+    android:horizontalGap="0px"
+    android:verticalGap="0px"
+    android:keyHeight="@dimen/key_height"
+    >
+</Keyboard>
diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml
index 9554925b6..80fb8884e 100644
--- a/java/res/xml-xlarge/kbd_qwerty.xml
+++ b/java/res/xml-xlarge/kbd_qwerty.xml
@@ -30,7 +30,6 @@
         <Key
             android:codes="@integer/key_tab"
             android:keyLabel="Tab"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:keyEdgeFlags="left" />
         <Key
             android:keyLabel="q"
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index 68dc92e24..f02174a91 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -30,7 +30,6 @@
         <Key
             android:codes="@integer/key_tab"
             android:keyLabel="Tab"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:keyEdgeFlags="left" />
         <Key
             android:keyLabel="∞" />