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>

2 files changed, 21 insertions, 0 deletions

diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java
index 17f8f74..a2e9a95 100644
--- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java
+++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java
@@ -25,6 +25,7 @@ import android.text.Editable;
 import android.text.Html;
 import android.text.InputFilter;
 import android.text.InputFilter.LengthFilter;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
@@ -69,6 +70,8 @@ import com.android.messaging.util.MediaUtil;
 import com.android.messaging.util.OsUtil;
 import com.android.messaging.util.UiUtils;
 
+import com.cyanogenmod.messaging.util.PrefsUtils;
+
 import java.util.Collection;
 import java.util.List;
 
@@ -213,6 +216,14 @@ public class ComposeMessageView extends LinearLayout
                 new LengthFilter(MmsConfig.get(ParticipantData.DEFAULT_SELF_SUB_ID)
                         .getMaxTextLimit()) });
 
+        if (PrefsUtils.isShowEmoticonsEnabled()) {
+            mComposeEditText.setInputType(mComposeEditText.getInputType()
+                    | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
+        } else {
+            mComposeEditText.setInputType(mComposeEditText.getInputType()
+                    & ~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
+        }
+
         mSelfSendIcon = (SimIconView) findViewById(R.id.self_send_icon);
         mSelfSendIcon.setOnClickListener(new OnClickListener() {
             @Override
diff --git a/src/com/cyanogenmod/messaging/util/PrefsUtils.java b/src/com/cyanogenmod/messaging/util/PrefsUtils.java
index f26e5b0..7247bdb 100644
--- a/src/com/cyanogenmod/messaging/util/PrefsUtils.java
+++ b/src/com/cyanogenmod/messaging/util/PrefsUtils.java
@@ -22,6 +22,8 @@ import com.android.messaging.R;
 import com.android.messaging.util.BuglePrefs;
 
 public class PrefsUtils {
+    public static final String SHOW_EMOTICONS_ENABLED    = "pref_show_emoticons";
+
     private PrefsUtils() {
         //Don't instantiate
     }
@@ -39,4 +41,12 @@ public class PrefsUtils {
                 R.bool.swipe_right_deletes_conversation_default);
         return prefs.getBoolean(prefKey, defaultValue);
     }
+
+    public static boolean isShowEmoticonsEnabled() {
+        final BuglePrefs prefs = BuglePrefs.getApplicationPrefs();
+        final Context context = Factory.get().getApplicationContext();
+        final boolean defaultValue = context.getResources().getBoolean(
+                R.bool.show_emoticons_pref_default);
+        return prefs.getBoolean(SHOW_EMOTICONS_ENABLED, defaultValue);
+    }
 }