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

Fix mismerge 

Change-Id: Ieb568d343a568a2b29297fe9824430ab5e8a4a94
This commit is contained in:
SpiritCroc 2020-10-17 16:13:36 +02:00
parent 6eff36c1a7
commit c5f59b9752
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vector/src/main/res/layout/item_bottom_sheet_action.xml
View File

@ -67,7 +67,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" tools:visibility="visible"
app:tint="@color/riotx_accent"
app:tint="?colorAccent" app:tint="?colorAccent"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />

2
vector/src/main/res/menu/home.xml
View File

@ -2,13 +2,13 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<!--
<item <item
android:id="@+id/menu_home_setting" android:id="@+id/menu_home_setting"
android:icon="@drawable/ic_settings_x" android:icon="@drawable/ic_settings_x"
android:title="@string/settings" android:title="@string/settings"
app:showAsAction="never" /> app:showAsAction="never" />
<!--
<item <item
android:id="@+id/menu_home_suggestion" android:id="@+id/menu_home_suggestion"
android:icon="@drawable/ic_material_bug_report" android:icon="@drawable/ic_material_bug_report"