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/join_conference_dialog.xml | |
| parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
| parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) | |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to 'src/main/res/layout/join_conference_dialog.xml')
| -rw-r--r-- | src/main/res/layout/join_conference_dialog.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index 95c9d24c..7609dd0d 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/your_account" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> <Spinner @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/conference_address" - android:textColor="@color/primarytext" + android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> <AutoCompleteTextView @@ -33,8 +33,8 @@ android:layout_height="wrap_content" android:hint="@string/conference_address_example" android:inputType="textEmailAddress" - android:textColor="@color/primarytext" - android:textColorHint="@color/secondarytext" /> + android:textColor="@color/black87" + android:textColorHint="@color/black54" /> <CheckBox android:id="@+id/bookmark" |