diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
commit | eac4bf7d902dc2579983daa29bcb74ca14790de6 (patch) | |
tree | 1139702220deb293c2f68d712280ff81e5b23f7c /src/main/res/layout/activity_about.xml | |
parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to 'src/main/res/layout/activity_about.xml')
-rw-r--r-- | src/main/res/layout/activity_about.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index ab0e34eb..d7d23f0f 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,7 +1,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context="eu.siacs.conversations.ui.AboutActivity" - android:background="@color/primarybackground" + android:background="@color/grey50" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -15,7 +15,7 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace"/> </ScrollView> |