filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts after rebase 

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
This commit is contained in:
Peter Vágner 2019-09-28 18:16:00 +02:00 committed by Peter Vágner
parent 7ef471ad0d
commit d4be68191c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/res/layout/merge_composer_layout.xml
View File

@ -71,7 +71,6 @@
android:layout_width="22dp" android:layout_width="22dp"
android:layout_height="22dp" android:layout_height="22dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/action_close"
android:src="@drawable/ic_close_round" android:src="@drawable/ic_close_round"
android:contentDescription="@string/cancel" android:contentDescription="@string/cancel"
android:tint="@color/riotx_notice" android:tint="@color/riotx_notice"
@ -90,7 +89,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/send_attachment"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:tint="?attr/colorAccent" android:tint="?attr/colorAccent"
@ -113,7 +111,6 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/send" android:contentDescription="@string/send"
android:src="@drawable/ic_send" android:src="@drawable/ic_send"
android:contentDescription="@string/send"
android:tint="?attr/colorAccent" android:tint="?attr/colorAccent"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />