aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-09-05 04:42:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-05 04:42:52 -0700
commit8a599c420ead9e653d9a47530e56105ff2f6a247 (patch)
tree466cfbb791e0adb7f00548f9d438701116a792e6 /java/res/layout
parentcde005c05ec6b552ec26740b578be12c7d24013b (diff)
parente8c6d5a480987a1b5d8c3455512f7d75c8fe1de4 (diff)
downloadlatinime-8a599c420ead9e653d9a47530e56105ff2f6a247.tar.gz
latinime-8a599c420ead9e653d9a47530e56105ff2f6a247.tar.xz
latinime-8a599c420ead9e653d9a47530e56105ff2f6a247.zip
Merge "Utilize StateListDrawable for key preview background" into jb-mr1-dev
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/key_preview.xml6
-rw-r--r--java/res/layout/key_preview_ics.xml27
2 files changed, 30 insertions, 3 deletions
diff --git a/java/res/layout/key_preview.xml b/java/res/layout/key_preview.xml
index 6ed892e28..2fcd0c4dd 100644
--- a/java/res/layout/key_preview.xml
+++ b/java/res/layout/key_preview.xml
@@ -20,8 +20,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="80dp"
- android:textSize="40dp"
+ android:layout_height="wrap_content"
+ android:background="@drawable/keyboard_key_feedback"
android:minWidth="32dp"
android:gravity="center"
- />
+/>
diff --git a/java/res/layout/key_preview_ics.xml b/java/res/layout/key_preview_ics.xml
new file mode 100644
index 000000000..222e8846c
--- /dev/null
+++ b/java/res/layout/key_preview_ics.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/keyboard_key_feedback_ics"
+ android:minWidth="32dp"
+ android:gravity="center"
+/>