settings: move up privacy section
Change-Id: Id2633f80cd89c54470fbe6d728ebb6fa7845cc29
diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/ring-android/app/src/main/res/layout/frag_settings.xml
index acfdcfd..b585ee0 100644
--- a/ring-android/app/src/main/res/layout/frag_settings.xml
+++ b/ring-android/app/src/main/res/layout/frag_settings.xml
@@ -235,6 +235,156 @@
</RelativeLayout>-->
+ <!-- Privacy -->
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:layout_marginStart="64dp"
+ android:text="@string/pref_category_privacy"
+ android:textColor="@color/textColorAccent"
+ android:textSize="18sp" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/padding_large">
+
+ <ImageView
+ android:id="@+id/system_typing_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/pref_typing_summary"
+ android:src="@drawable/baseline_keyboard_24"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toStartOf="@+id/settings_typing"
+ android:layout_toEndOf="@+id/system_typing_image"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:lines="1"
+ android:text="@string/pref_typing_title" />
+
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_typing_summary" />
+
+ </LinearLayout>
+
+ <Switch
+ android:id="@+id/settings_typing"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:checked="true"
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/padding_large">
+
+ <ImageView
+ android:id="@+id/system_read_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/pref_read_summary"
+ android:src="@drawable/baseline_mark_chat_read_24dp"
+ android:layout_alignParentStart="true"
+ app:tint="@color/colorPrimary"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toStartOf="@+id/settings_read"
+ android:layout_toEndOf="@+id/system_read_image"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:lines="1"
+ android:text="@string/pref_read_title" />
+
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_read_summary" />
+
+ </LinearLayout>
+
+ <Switch
+ android:id="@+id/settings_read"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:checked="true"
+ android:layout_marginStart="16dp"
+ android:layout_centerVertical="true"/>
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/settings_clear_history"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground"
+ android:padding="@dimen/padding_large">
+
+ <ImageView
+ android:id="@+id/system_clear_history_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_clearHistory_summary"
+ android:src="@drawable/baseline_clear_all_24"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp" />
+
+ <TextView
+ style="@style/ListPrimary"
+ android:id="@+id/system_clear_history_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:lines="1"
+ android:text="@string/pref_clearHistory_title"
+ android:layout_toEndOf="@+id/system_clear_history_image"/>
+
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_clearHistory_summary"
+ android:layout_toEndOf="@+id/system_clear_history_image"
+ android:layout_below="@id/system_clear_history_title"/>
+
+ </RelativeLayout>
+
<!-- System settings -->
<TextView
@@ -446,156 +596,6 @@
</RelativeLayout>
- <!-- Privacy -->
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:layout_marginStart="64dp"
- android:text="@string/pref_category_privacy"
- android:textColor="@color/textColorAccent"
- android:textSize="18sp" />
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="@dimen/padding_large">
-
- <ImageView
- android:id="@+id/system_typing_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@string/pref_typing_summary"
- android:src="@drawable/baseline_keyboard_24"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="32dp"/>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toStartOf="@+id/settings_typing"
- android:layout_toEndOf="@+id/system_typing_image"
- android:orientation="vertical">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:lines="1"
- android:text="@string/pref_typing_title" />
-
- <TextView
- style="@style/ListSecondary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_typing_summary" />
-
- </LinearLayout>
-
- <Switch
- android:id="@+id/settings_typing"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:checked="true"
- android:layout_marginStart="16dp"
- android:layout_centerVertical="true"/>
-
- </RelativeLayout>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="@dimen/padding_large">
-
- <ImageView
- android:id="@+id/system_read_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@string/pref_read_summary"
- android:src="@drawable/baseline_mark_chat_read_24dp"
- android:layout_alignParentStart="true"
- app:tint="@color/colorPrimary"
- android:layout_centerVertical="true"
- android:layout_marginEnd="32dp"/>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toStartOf="@+id/settings_read"
- android:layout_toEndOf="@+id/system_read_image"
- android:orientation="vertical">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:lines="1"
- android:text="@string/pref_read_title" />
-
- <TextView
- style="@style/ListSecondary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_read_summary" />
-
- </LinearLayout>
-
- <Switch
- android:id="@+id/settings_read"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:checked="true"
- android:layout_marginStart="16dp"
- android:layout_centerVertical="true"/>
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/settings_clear_history"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?attr/selectableItemBackground"
- android:padding="@dimen/padding_large">
-
- <ImageView
- android:id="@+id/system_clear_history_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_clearHistory_summary"
- android:src="@drawable/baseline_clear_all_24"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:layout_marginEnd="32dp" />
-
- <TextView
- style="@style/ListPrimary"
- android:id="@+id/system_clear_history_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:lines="1"
- android:text="@string/pref_clearHistory_title"
- android:layout_toEndOf="@+id/system_clear_history_image"/>
-
- <TextView
- style="@style/ListSecondary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_clearHistory_summary"
- android:layout_toEndOf="@+id/system_clear_history_image"
- android:layout_below="@id/system_clear_history_title"/>
-
- </RelativeLayout>
-
</LinearLayout>
</cx.ring.views.BoundedScrollView>
</RelativeLayout>