diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-14 22:54:02 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-14 22:54:02 +0100 |
commit | a3f9f30a6c1751c44f7eb4af23d44f67f00a568c (patch) | |
tree | 75ead91b78461733d306259c4cf61fe98562bc3a /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
parent | a6a9ed487786451f0eedfaa63fbbc5332d4adcf3 (diff) | |
parent | 0a96bec3c1d65c0d3da22511f3b92a21fd94ad0f (diff) |
Merge pull request #885 from SamWhited/display-enter-key
Add option to swap enter/emoticon key
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 69dd47e7..0deeacf0 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -96,6 +96,7 @@ public abstract class XmppActivity extends Activity { private DisplayMetrics metrics; protected int mTheme; + protected boolean mUsingEnterKey = false; protected interface OnValueEdited { public void onValueEdited(String value); @@ -303,9 +304,14 @@ public abstract class XmppActivity extends Activity { R.color.secondarybackground); this.mTheme = findTheme(); setTheme(this.mTheme); + this.mUsingEnterKey = usingEnterKey(); mUseSubject = getPreferences().getBoolean("use_subject", true); } + protected boolean usingEnterKey() { + return getPreferences().getBoolean("display_enter_key", false); + } + protected SharedPreferences getPreferences() { return PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); |