Merge pull request #2445 from SamWhited/send_content_description

Daniel Gultsch created 8 years ago

Add content description to send button

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 +
src/main/res/layout/fragment_conversation.xml                     | 3 
src/main/res/values/strings.xml                                   | 1 
3 files changed, 6 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

@@ -891,6 +891,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 				updateChatState(this.conversation, msg);
 			}
 			this.conversation.trim();
+			this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message_to_x,conversation.getName()));
+		} else {
+			this.mSendButton.setContentDescription(this.getActivity().getApplicationContext().getString(R.string.send_message));
 		}
 
 		this.conversation = conversation;

src/main/res/layout/fragment_conversation.xml

@@ -57,7 +57,8 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:background="?attr/color_background_primary"
-            android:src="?attr/ic_send_text_offline" />
+            android:src="?attr/ic_send_text_offline"
+            android:contentDescription="@string/send_message"/>
     </RelativeLayout>
 
     <RelativeLayout

src/main/res/values/strings.xml

@@ -81,6 +81,7 @@
 	<string name="also_end_conversation">End this conversation afterwards</string>
 	<string name="choose_presence">Choose device</string>
 	<string name="send_unencrypted_message">Send unencrypted message</string>
+	<string name="send_message">Send message</string>
 	<string name="send_message_to_x">Send message to %s</string>
 	<string name="send_otr_message">Send OTR encrypted message</string>
 	<string name="send_omemo_message">Send OMEMO encrypted message</string>