From c2f72e3d8c91f92cc8cfe6480196a2f55d9e4364 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 1 Apr 2018 20:22:38 +0200 Subject: finished app compat themeing --- src/main/res/layout/activity_change_password.xml | 4 ++-- src/main/res/layout/activity_contact_details.xml | 1 - src/main/res/layout/activity_edit_account.xml | 11 ++++------- src/main/res/layout/activity_publish_profile_picture.xml | 12 ++++-------- src/main/res/layout/activity_trust_keys.xml | 6 ++---- 5 files changed, 12 insertions(+), 22 deletions(-) (limited to 'src/main/res/layout') diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 55cd7dd53..af1dcd271 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" app:passwordToggleEnabled="true" - app:passwordToggleTint="?attr/color_text_secondary"> + app:passwordToggleTint="?android:textColorSecondary"> + app:passwordToggleTint="?android:textColorSecondary"> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 687db3cea..90dd1b194 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" app:passwordToggleEnabled="true" - app:passwordToggleTint="?attr/color_text_secondary"> + app:passwordToggleTint="?android:textColorSecondary"> + android:text="@string/cancel" /> + android:layout_marginTop="7dp" />