summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdrianDC <radian.dc@gmail.com>2016-01-31 22:39:56 +0100
committerMartin Brabham <optedoblivion@cyngn.com>2016-03-01 13:02:15 -0500
commit2a065f1a6887ebf43eae9e431464fae8c32b9d7a (patch)
treeec8b48d160f241cc231bba89f857b2a2865c334c /res/values
parent80c9a59ac18e0676d4a4a8d73255b12672b5c094 (diff)
downloadpackages_apps_Messaging-2a065f1a6887ebf43eae9e431464fae8c32b9d7a.zip
packages_apps_Messaging-2a065f1a6887ebf43eae9e431464fae8c32b9d7a.tar.gz
packages_apps_Messaging-2a065f1a6887ebf43eae9e431464fae8c32b9d7a.tar.bz2
Messaging: Toggable keyboard emoticons access
* Allows keyboards to always display the line return key Change-Id: I316154ebc19c2f1274b9059336cef9940d9d6cff Signed-off-by: AdrianDC <radian.dc@gmail.com>
Diffstat (limited to 'res/values')
-rw-r--r--res/values/cm_constants.xml4
-rw-r--r--res/values/cm_strings.xml4
-rw-r--r--res/values/styles.xml4
3 files changed, 10 insertions, 2 deletions
diff --git a/res/values/cm_constants.xml b/res/values/cm_constants.xml
index 87ed210..5dcac5d 100644
--- a/res/values/cm_constants.xml
+++ b/res/values/cm_constants.xml
@@ -22,4 +22,8 @@
<!-- This should really go into a config xml, but whoever wrote this app is an idiot, so follow their pattern -->
<bool name="swipe_right_deletes_conversation_default" translatable="false">false</bool>
+
+ <!-- Preference keys for user-visible settings -->
+ <!-- Application-wide settings -->
+ <bool name="show_emoticons_pref_default" translatable="false">true</bool>
</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8c48b8f..66fdbbd 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -51,4 +51,8 @@
<string name="send">Send</string>
<string name="compose_message_hint_text">Enter message</string>
+
+ <!-- Show emoticons -->
+ <string name="show_emoticons_pref_title">Emoticons access</string>
+ <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f017b23..7009202 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -133,7 +133,7 @@
<item name="android:background">@null</item>
<item name="android:scrollHorizontally">false</item>
<item name="android:textCursorDrawable">@null</item>
- <item name="android:inputType">textShortMessage|textAutoCorrect|textCapSentences|textMultiLine</item>
+ <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
</style>
<style name="ConversationComposeSubjectText" parent="ConversationComposeSendText">
@@ -656,7 +656,7 @@
<item name="android:backgroundTint">@color/outgoing_message_bg</item>
<item name="android:scrollHorizontally">false</item>
<item name="android:textCursorDrawable">@null</item>
- <item name="android:inputType">textShortMessage|textAutoCorrect|textCapSentences|textMultiLine</item>
+ <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
</style>
<style name="QMConversationMessage" parent="ConversationMessage">