From 1f217dbd517af9e094aee1a1fb5085e8933892c3 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Sat, 24 May 2014 21:18:47 +0900 Subject: [PATCH] Use functional key background for action key with label This CL also adds label_search_key string resources for consistency. Bug: 15135033 Change-Id: I81cae243e83a590ef56fe758a43c7184fc4159aa --- java/res/values/strings-action-keys.xml | 2 ++ java/res/xml-sw600dp/key_styles_enter.xml | 17 ++++++++++------- java/res/xml/key_styles_enter.xml | 17 ++++++++++------- .../keyboard/internal/KeyboardTextsSet.java | 1 + 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/java/res/values/strings-action-keys.xml b/java/res/values/strings-action-keys.xml index 7003784c6..96b2e7dda 100644 --- a/java/res/values/strings-action-keys.xml +++ b/java/res/values/strings-action-keys.xml @@ -29,6 +29,8 @@ Done Send + + Search Pause diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml index 742bb3ec3..34396252d 100644 --- a/java/res/xml-sw600dp/key_styles_enter.xml +++ b/java/res/xml-sw600dp/key_styles_enter.xml @@ -131,7 +131,6 @@ + + + @@ -215,8 +220,7 @@ > diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 1d46dd523..8add316ab 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -298,7 +298,6 @@ + + + @@ -382,8 +387,7 @@ > diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 2ec5bcc97..cd6abeed3 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -140,6 +140,7 @@ public final class KeyboardTextsSet { "label_send_key", "label_next_key", "label_done_key", + "label_search_key", "label_previous_key", // Other labels. "label_pause_key",