diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-01-29 23:26:41 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-01-29 23:26:41 +0100 |
| commit | 6c3ea7f2bdde738c48067ecb6b6588b7ad39a05e (patch) | |
| tree | 741f7defe8265ee8b61f95ddc3f3ecab9a72d158 /src/main/res/layout | |
| parent | f2bf64d19d7eb14f34324311ebf4f95378d81fbe (diff) | |
| parent | 26bc2d387f9efb4fa936b95b2c6cc26b8503757f (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/contact_key.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 0093f032..750c28e0 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -338,7 +338,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_copy" + android:src="?attr/icon_copy" android:visibility="visible" android:contentDescription="@string/copy_otr_clipboard_description"/> </RelativeLayout> diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 332ac2a9..36873654 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -76,7 +76,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_edit_dark"/> + android:src="?attr/icon_edit_dark"/> </RelativeLayout> <RelativeLayout @@ -103,7 +103,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_settings"/> + android:src="?attr/icon_settings"/> </RelativeLayout> <TextView diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 7053857f..75572877 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -35,7 +35,7 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:padding="8dp" - android:src="@drawable/ic_action_remove" + android:src="?attr/icon_remove" android:visibility="invisible" /> </RelativeLayout>
\ No newline at end of file |