aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/values
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-09-09 15:03:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-09 15:03:15 +0000
commit63ee10d63a67fd8e2de3047c4a8de1dbac0c9fc1 (patch)
tree94184c0d59870ed7dc13db5d8e5a785cf1070d6b /java/res/values
parent138647876becc41c401087037013e781142753b6 (diff)
parentc29276b782cfc45be5ab79177e991f2cba8fb04b (diff)
downloadlatinime-63ee10d63a67fd8e2de3047c4a8de1dbac0c9fc1.tar.gz
latinime-63ee10d63a67fd8e2de3047c4a8de1dbac0c9fc1.tar.xz
latinime-63ee10d63a67fd8e2de3047c4a8de1dbac0c9fc1.zip
am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b': Keep aspect ratio of Material action key background
Diffstat (limited to 'java/res/values')
-rw-r--r--java/res/values/attrs.xml2
-rw-r--r--java/res/values/themes-lxx-dark.xml1
-rw-r--r--java/res/values/themes-lxx-light.xml1
3 files changed, 4 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 2e81bdf48..f1253b40c 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -338,6 +338,8 @@
<!-- If true, use functionalTextColor instead of ketTextColor to drawing the label on
the key -->
<flag name="followFunctionalTextColor" value="0x80000" />
+ <!-- Keep aspect ratio of key background. -->
+ <flag name="keepBackgroundAspectRatio" value="0x100000" />
<!-- If true, disable keyHintLabel. -->
<flag name="disableKeyHintLabel" value="0x40000000" />
<!-- If true, disable additionalMoreKeys. -->
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index 76e9d33bf..5b2681359 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -114,6 +114,7 @@
<item name="android:background">@android:color/transparent</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_dark</item>
<item name="divider">@null</item>
+ <item name="keyLabelFlags">keepBackgroundAspectRatio</item>
</style>
<style
name="SuggestionStripView.LXX_Dark"
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index 5cd84171d..f607807c8 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -114,6 +114,7 @@
<item name="android:background">@android:color/transparent</item>
<item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_light</item>
<item name="divider">@null</item>
+ <item name="keyLabelFlags">keepBackgroundAspectRatio</item>
</style>
<style
name="SuggestionStripView.LXX_Light"