TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-13 10:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: more merge conflict compile issues

Browse Source
This commit is contained in:
0x330a
2023-07-19 00:02:43 +10:00
parent 07e1d80654
commit 74ee433eec
10 changed files with 383 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/view_control_message.xml
View File

@@ -31,7 +31,6 @@
<TextView
android:id="@+id/textView"
android:contentDescription="@string/AccessibilityId_control_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/AccessibilityId_configuration_message"

1
app/src/main/res/values/strings.xml
View File

@@ -78,7 +78,6 @@
<!-- Conversation icons -->
<string name="AccessibilityId_call_button">Call button</string>
<string name="AccessibilityId_settings">Settings</string>
<string name="AccessibilityId_disappearing_messages_timer">Disappearing messages timer</string>
<string name="AccessibilityId_disappearing_messages_time_picker">Time selector</string>
<string name="AccessibilityId_accept_message_request_button">Accept message request</string>
<string name="AccessibilityId_decline_message_request_button">Decline message request</string>