Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1

1 files changed, 33 insertions, 33 deletions

diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 750c28e0..98de84f5 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/secondarybackground" >
+    android:background="@color/grey200" >
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_jabber_id"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <AutoCompleteTextView
@@ -51,8 +51,8 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/account_settings_example_jabber_id"
                     android:inputType="textEmailAddress"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
 
                 <TextView
@@ -60,7 +60,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/account_settings_password"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <EditText
@@ -69,8 +69,8 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/password"
                     android:inputType="textPassword"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
@@ -79,7 +79,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/register_account"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody" />
 
                 <TextView
@@ -87,7 +87,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_confirm_password"
-                    android:textColor="@color/primarytext"
+                    android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody"
                     android:visibility="gone" />
 
@@ -99,8 +99,8 @@
                     android:hint="@string/confirm_password"
                     android:inputType="textPassword"
                     android:visibility="gone"
-                    android:textColor="@color/primarytext"
-                    android:textColorHint="@color/secondarytext"
+                    android:textColor="@color/black87"
+                    android:textColorHint="@color/black54"
                     android:textSize="?attr/TextSizeBody" />
                 </LinearLayout>
             </RelativeLayout>
@@ -132,7 +132,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -140,7 +140,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -161,7 +161,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -169,7 +169,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -182,7 +182,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -190,7 +190,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -203,7 +203,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -211,7 +211,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -224,7 +224,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -232,7 +232,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -245,7 +245,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -253,7 +253,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -266,7 +266,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -274,7 +274,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -287,7 +287,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody" />
 
                         <TextView
@@ -295,7 +295,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -318,14 +318,14 @@
                             android:id="@+id/otr_fingerprint"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/primarytext"
+                            android:textColor="@color/black87"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace" />
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/secondarytext"
+                            android:textColor="@color/black54"
                             android:textSize="?attr/TextSizeInfo"
                             android:text="@string/otr_fingerprint"/>
                     </LinearLayout>
@@ -337,7 +337,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:background="?android:selectableItemBackground"
-                        android:padding="8dp"
+                        android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
                         android:visibility="visible"
                         android:contentDescription="@string/copy_otr_clipboard_description"/>
@@ -363,14 +363,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/primarytext" />
+            android:textColor="@color/black87" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/divider" />
+            android:background="@color/black12" />
 
         <Button
             android:id="@+id/save_button"
@@ -380,7 +380,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/secondarytext" />
+            android:textColor="@color/black54" />
     </LinearLayout>
 
 </RelativeLayout>