From e05392f3fabc93fb6ba3aaf8a03556193ad1cf9b Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Wed, 4 May 2016 21:57:03 +0200
Subject: set manually_change_presence to true as default

and hide option to set presence for all accounts
---
 .../eu/siacs/conversations/ui/XmppActivity.java    |  2 +-
 src/main/res/layout/activity_set_presence.xml      | 37 +++++++++++-----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 899d45412..cf821eb08 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -1008,7 +1008,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected boolean manuallyChangePresence() {
-		return getPreferences().getBoolean("manually_change_presence", false);
+		return getPreferences().getBoolean("manually_change_presence", true);
 	}
 
 	protected void unregisterNdefPushMessageCallback() {
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 8195092ff..c59915685 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:background="@color/grey200"
-            android:id="@+id/scroll_view">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/grey200"
+    android:id="@+id/scroll_view">
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -42,7 +42,8 @@
                 android:text="@string/all_accounts_on_this_device"
                 android:id="@+id/all_accounts"
                 android:textColor="@color/black87"
-                android:textSize="?attr/TextSizeBody"/>
+                android:textSize="?attr/TextSizeBody"
+                android:visibility="invisible"/>
             <Button
                 android:id="@+id/change_presence"
                 style="?android:attr/borderlessButtonStyle"
@@ -54,19 +55,19 @@
                 android:text="@string/change_presence"
                 android:textColor="@color/accent"/>
         </LinearLayout>
-    <LinearLayout
-        android:id="@+id/templates"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:background="@drawable/infocard_border"
-        android:padding="@dimen/infocard_padding"
-        android:orientation="vertical"
-        android:divider="?android:dividerHorizontal"
-        android:showDividers="middle">
+        <LinearLayout
+            android:id="@+id/templates"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:background="@drawable/infocard_border"
+            android:padding="@dimen/infocard_padding"
+            android:orientation="vertical"
+            android:divider="?android:dividerHorizontal"
+            android:showDividers="middle">
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3