aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-10-07 15:11:43 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-10-09 12:39:15 +0900
commit15480481be790c913b0117d0841565efd399cd01 (patch)
treebf7e8d74f619ec855b268b8ce6e6da32eacc860a /java/res
parent3c6ac75c48e0f57d389305c9c22a3be960682ed2 (diff)
downloadlatinime-15480481be790c913b0117d0841565efd399cd01.tar.gz
latinime-15480481be790c913b0117d0841565efd399cd01.tar.xz
latinime-15480481be790c913b0117d0841565efd399cd01.zip
Add keyboard shadow
This CL sets 8dp elevation ot input view in order to cast a shadow onto underlying application. Bug: 16210054 Change-Id: I7779c63612fc88e24dde65de3e4e7a45b9d1762f
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/input_view.xml3
-rw-r--r--java/res/values-v21/themes-lxx.xml28
-rw-r--r--java/res/values/attrs.xml2
-rw-r--r--java/res/values/themes-common.xml1
-rw-r--r--java/res/values/themes-holo.xml4
-rw-r--r--java/res/values/themes-ics.xml1
-rw-r--r--java/res/values/themes-klp.xml1
-rw-r--r--java/res/values/themes-lxx-dark.xml1
-rw-r--r--java/res/values/themes-lxx-light.xml1
-rw-r--r--java/res/values/themes-lxx.xml4
10 files changed, 45 insertions, 1 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index 46551f63f..ae3c19db5 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -21,7 +21,8 @@
<com.android.inputmethod.latin.InputView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ style="?attr/inputViewStyle">
<include
android:id="@+id/main_keyboard_frame"
layout="@layout/main_keyboard_frame" />
diff --git a/java/res/values-v21/themes-lxx.xml b/java/res/values-v21/themes-lxx.xml
new file mode 100644
index 000000000..5a6017cce
--- /dev/null
+++ b/java/res/values-v21/themes-lxx.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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 xmlns:android="http://schemas.android.com/apk/res/android">
+ <style
+ name="InputView.LXX"
+ parent="InputView"
+ >
+ <item name="android:elevation">8dp</item>
+ </style>
+</resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index f2072fd37..be35d131d 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -20,6 +20,8 @@
<resources>
<declare-styleable name="KeyboardTheme">
+ <!-- InputView style -->
+ <attr name="inputViewStyle" format="reference" />
<!-- Keyboard style -->
<attr name="keyboardStyle" format="reference" />
<!-- KeyboardView style -->
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 110f6b792..f7cb10f93 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -20,6 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardIcons" />
+ <style name="InputView" />
<!-- Default theme values -->
<style name="Keyboard">
<item name="rowHeight">25%p</item>
diff --git a/java/res/values/themes-holo.xml b/java/res/values/themes-holo.xml
index 9f1bd2f78..efac65627 100644
--- a/java/res/values/themes-holo.xml
+++ b/java/res/values/themes-holo.xml
@@ -19,6 +19,10 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style
+ name="InputView.Holo"
+ parent="InputView"
+ />
<!-- Holo KeyboardView theme (ICS and KLP) -->
<style
name="KeyboardView.Holo"
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index bfbac0a94..ecf40e4e6 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -20,6 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.ICS" parent="KeyboardIcons.Holo">
+ <item name="inputViewStyle">@style/InputView.Holo</item>
<item name="keyboardStyle">@style/Keyboard.ICS</item>
<item name="keyboardViewStyle">@style/KeyboardView.ICS</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.ICS</item>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index 36b1fc117..de1cd9bf1 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -20,6 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.KLP" parent="KeyboardIcons.Holo">
+ <item name="inputViewStyle">@style/InputView.Holo</item>
<item name="keyboardStyle">@style/Keyboard.KLP</item>
<item name="keyboardViewStyle">@style/KeyboardView.KLP</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.KLP</item>
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 67f94f329..b081772e9 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -20,6 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.LXX_Dark" parent="KeyboardIcons.LXX_Dark">
+ <item name="inputViewStyle">@style/InputView.LXX</item>
<item name="keyboardStyle">@style/Keyboard.LXX_Dark</item>
<item name="keyboardViewStyle">@style/KeyboardView.LXX_Dark</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Dark</item>
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index be817f46a..3d294e450 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -20,6 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="KeyboardTheme.LXX_Light" parent="KeyboardIcons.LXX_Light">
+ <item name="inputViewStyle">@style/InputView.LXX</item>
<item name="keyboardStyle">@style/Keyboard.LXX_Light</item>
<item name="keyboardViewStyle">@style/KeyboardView.LXX_Light</item>
<item name="mainKeyboardViewStyle">@style/MainKeyboardView.LXX_Light</item>
diff --git a/java/res/values/themes-lxx.xml b/java/res/values/themes-lxx.xml
index c72188871..463306b43 100644
--- a/java/res/values/themes-lxx.xml
+++ b/java/res/values/themes-lxx.xml
@@ -19,6 +19,10 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style
+ name="InputView.LXX"
+ parent="InputView"
+ />
<!-- LXX KeyboardView theme (LXX_Light and LXX_Dark) -->
<style
name="KeyboardView.LXX"