diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-15 00:12:47 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-15 00:12:47 +0200 |
| commit | 6376e5fd74dd199b5ab0f71686adff65c05798a6 (patch) | |
| tree | 14979a4f3428fdb77b56b01bc2aff9d308eb1e5e /src/main/res | |
| parent | 977a770b818d9b40a93d2acd13b6b5d5c874172d (diff) | |
| parent | 018f978a22b7314b21b83c40d8741a811ffc55bf (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 9b7f39415..599ec2c7d 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -80,7 +80,7 @@ android:id="@+id/status_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black87" + android:textColor="@color/black54" android:textStyle="italic" android:textSize="?attr/TextSizeBody" android:layout_gravity="center_horizontal" /> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9a96f7226..b9e7ca116 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -133,7 +133,7 @@ android:title="@string/pref_expert_options"> <PreferenceCategory android:title="@string/pref_general"> <ListPreference - android:defaultValue="Mobile" + android:defaultValue="@string/default_resource" android:entries="@array/resources" android:entryValues="@array/resources" android:key="resource" |