Fix compilation issues after rebase

This commit is contained in:
Benoit Marty
2019-05-27 15:43:26 +02:00
parent b9d76f5047
commit 02555fcbac
4 changed files with 2 additions and 11 deletions

View File

@ -6,7 +6,6 @@
android:id="@+id/itemPublicRoomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_room_item"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground">

View File

@ -6,7 +6,6 @@
android:id="@+id/itemRoomDirectoryLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_room_item"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground">

View File

@ -21,8 +21,5 @@
<color name="black_37">#5d000000</color>
<color name="black">#000000</color>
<color name="black_87">#de000000</color>
<color name="black_38">#61000000</color>
<color name="black_37">#5d000000</color>
</resources>