Merge branch 'preferences_ui' into 'master'

Preferences ui

See merge request leap/bitmask_android!145

1 files changed, 3 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java
index a499cdd1..79563bcf 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java
@@ -92,6 +92,9 @@ public class IconSwitchEntry extends LinearLayout {
                 iconView.setImageDrawable(drawable);
             }
 
+            boolean singleLine = typedArray.getBoolean(R.styleable.IconTextEntry_singleLine, true);
+            subtitleView.setSingleLine(singleLine);
+
             typedArray.recycle();
         }
     }