From 8fd688ca96005152be754eeba1be72c7c0aab9ad Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 11 Aug 2015 17:35:53 +0200
Subject: Merge tag '1.5.2' into trz/rebase

---
 src/main/res/layout/activity_publish_profile_picture.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/res/layout/activity_publish_profile_picture.xml')

diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index fac499bc..4b249745 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/primarybackground" >
+    android:background="@color/grey50" >
 
     <LinearLayout
         android:id="@+id/account_image_wrapper"
@@ -27,7 +27,7 @@
         android:layout_below="@id/account_image_wrapper"
         android:layout_centerHorizontal="true"
         android:text="@string/touch_to_choose_picture"
-        android:textColor="@color/secondarytext" />
+        android:textColor="@color/black54" />
 
     <TextView
         android:id="@+id/secondary_hint"
@@ -36,7 +36,7 @@
         android:layout_below="@id/hint"
         android:layout_centerHorizontal="true"
         android:text="@string/or_long_press_for_default"
-        android:textColor="@color/secondarytext" />
+        android:textColor="@color/black54" />
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -53,14 +53,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/publish_button"
@@ -70,7 +70,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/publish"
-            android:textColor="@color/secondarytext" />
+            android:textColor="@color/black54" />
     </LinearLayout>
 
     <LinearLayout
@@ -89,7 +89,7 @@
             android:id="@+id/account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -99,7 +99,7 @@
             android:layout_marginTop="8dp"
             android:minLines="3"
             android:text="@string/publish_avatar_explanation"
-            android:textColor="@color/primarytext"
+            android:textColor="@color/black87"
             android:textSize="?attr/TextSizeBody" />
     </LinearLayout>
 
-- 
cgit v1.2.3