summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdrianDC <radian.dc@gmail.com>2016-01-31 22:39:56 +0100
committerJoey Rizzoli <joey@cyanogenmoditalia.it>2016-10-17 16:31:06 +0200
commit116e32838a24fb9f04f4cc57761fa8ffa98efa87 (patch)
tree0db35746261f48ad6ffbe9512448ab5fcd2a4842 /res/values
parenta00ab157529d3bfb10a65f2bcad03bed2450be33 (diff)
downloadandroid_packages_apps_Messaging-116e32838a24fb9f04f4cc57761fa8ffa98efa87.tar.gz
android_packages_apps_Messaging-116e32838a24fb9f04f4cc57761fa8ffa98efa87.tar.bz2
android_packages_apps_Messaging-116e32838a24fb9f04f4cc57761fa8ffa98efa87.zip
Messaging: Toggable keyboard emoticons access
* Allows keyboards to always display the line return key Change-Id: I9ecb19733f707d35771255018afebf0b5cda5e6d 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.xml10
3 files changed, 17 insertions, 1 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 09c6d80..a9f317b 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -16,4 +16,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="swipe_right_deletes_conversation_text">Swipe right deletes conversation</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 582c755..994a54d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -76,6 +76,14 @@
<item name="android:windowNoDisplay">true</item>
</style>
+ <style name="InvisibleNoDisplay" parent="BugleBaseTheme">
+ <item name="android:windowBackground">@null</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:windowAnimationStyle">@null</item>
+ <item name="android:windowDisablePreview">true</item>
+ </style>
+
<style name="BugleActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
<item name="height">@dimen/action_bar_height</item>
<item name="displayOptions">showTitle</item>
@@ -133,7 +141,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">