diff --git a/res/layout-land/about.xml b/res/layout-land/about.xml index 6d1896de8..6d9d277b9 100644 --- a/res/layout-land/about.xml +++ b/res/layout-land/about.xml @@ -32,7 +32,7 @@ android:id="@+id/cancel" android:src="@drawable/dialer_back" android:background="@drawable/toolbar_button" - android:contentDescription="@string/content_description_edit" + android:contentDescription="@string/content_description_dialer_back" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml index 0441dccc4..9c556801b 100644 --- a/res/layout-land/call.xml +++ b/res/layout-land/call.xml @@ -225,6 +225,7 @@ android:id="@+id/dialer" android:src="@drawable/footer_dialer" android:background="@color/colorC" + android:contentDescription="@string/content_description_numpad" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" @@ -234,6 +235,7 @@ android:id="@+id/hang_up" android:src="@drawable/call_hangup" android:background="@drawable/hangup" + android:contentDescription="@string/content_description_hang_up" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.5" @@ -243,6 +245,7 @@ android:id="@+id/chat" android:src="@drawable/footer_chat" android:background="@color/colorC" + android:contentDescription="@string/content_description_chat_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" @@ -265,6 +268,7 @@ android:id="@+id/video" android:src="@drawable/camera_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_switch_video" android:padding="20dp" android:layout_width="match_parent" android:layout_height="match_parent"/> @@ -284,6 +288,7 @@ android:id="@+id/micro" android:src="@drawable/micro_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_micro" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -293,6 +298,7 @@ android:id="@+id/speaker" android:src="@drawable/speaker_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_speaker" android:padding="15dp" android:layout_width="match_parent" android:layout_height="match_parent" @@ -302,6 +308,7 @@ android:id="@+id/audio_route" android:src="@drawable/routes_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_audio_route" android:visibility="gone" android:padding="20dp" android:layout_width="match_parent" @@ -312,6 +319,7 @@ android:id="@+id/options" android:src="@drawable/options_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_call_options" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -345,6 +353,7 @@ android:id="@+id/route_bluetooth" android:src="@drawable/route_bluetooth" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_bluetooth" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -355,6 +364,7 @@ android:id="@+id/add_call" android:src="@drawable/options_add_call" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_add_call" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -386,6 +396,7 @@ android:id="@+id/route_earpiece" android:src="@drawable/route_earpiece" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_earpiece" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -396,6 +407,7 @@ android:id="@+id/transfer" android:src="@drawable/options_transfer_call" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_transfer" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -426,8 +438,9 @@ android:id="@+id/route_speaker" android:src="@drawable/route_speaker" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_speaker" android:visibility="invisible" - android:padding="20dp" + android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.4"/> @@ -436,6 +449,7 @@ android:id="@+id/conference" android:src="@drawable/options_start_conference" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_conference" android:visibility="invisible" android:padding="15dp" android:layout_width="match_parent" diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml index f8caec810..a8f3d65b8 100644 --- a/res/layout-land/chatlist_cell.xml +++ b/res/layout-land/chatlist_cell.xml @@ -89,11 +89,13 @@ android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/chat_list_indicator" + android:contentDescription="@string/content_description_unread_chat_message" style="@style/font18" android:gravity="center" android:singleLine="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" android:layout_alignParentTop="true"/> + android:layout_alignParentEnd="true" + android:layout_alignParentTop="true"/> @@ -132,6 +133,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textPassword" + android:contentDescription="@string/content_description_confirm_password_field" android:textCursorDrawable="@null" android:layout_width="match_parent" android:layout_height="40dp" @@ -169,6 +171,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="text|textEmailAddress" + android:contentDescription="@string/content_description_email_field" android:textCursorDrawable="@null" android:layout_width="match_parent" android:layout_height="40dp" diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml index ba91408ed..54239505d 100644 --- a/res/layout-sw533dp-land/assistant_linphone_login.xml +++ b/res/layout-sw533dp-land/assistant_linphone_login.xml @@ -50,6 +50,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="text|textEmailAddress" + android:contentDescription="@string/content_description_username_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> @@ -103,6 +104,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_display_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> diff --git a/res/layout-sw533dp-land/assistant_login.xml b/res/layout-sw533dp-land/assistant_login.xml index 0f36ca6cb..0d02af245 100644 --- a/res/layout-sw533dp-land/assistant_login.xml +++ b/res/layout-sw533dp-land/assistant_login.xml @@ -54,6 +54,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="text|textEmailAddress" + android:contentDescription="@string/content_description_username_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> @@ -107,6 +108,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_display_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> @@ -131,6 +133,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_domain_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml index 561a27ade..12862af3b 100644 --- a/res/layout-sw533dp-land/call.xml +++ b/res/layout-sw533dp-land/call.xml @@ -228,7 +228,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:padding="20dp" /> + android:padding="15dp" + android:contentDescription="@string/content_description_numpad"/> + android:padding="12dp" + android:contentDescription="@string/content_description_hang_up"/> + android:padding="15dp" + android:contentDescription="@string/content_description_chat_button"/> @@ -266,9 +269,10 @@ android:id="@+id/video" android:src="@drawable/camera_default" android:background="@drawable/button_background" - android:padding="22dp" + android:padding="20dp" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" + android:contentDescription="@string/content_description_switch_video"/> + android:layout_weight="1" + android:contentDescription="@string/content_description_toggle_micro"/> + android:layout_weight="1" + android:contentDescription="@string/content_description_toggle_speaker"/> + android:layout_weight="1" + android:contentDescription="@string/content_description_audio_route"/> + android:layout_weight="1" + android:contentDescription="@string/content_description_call_options"/> @@ -327,7 +335,8 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_above="@id/menu" - android:orientation="horizontal" android:layout_alignParentLeft="true" + android:orientation="horizontal" + android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_bluetooth"/> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_add_call"/> @@ -387,21 +398,23 @@ android:id="@+id/route_earpiece" android:src="@drawable/route_earpiece" android:background="@drawable/button_background" - android:padding="20dp" + android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1.4"/> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_earpiece"/> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_transfer"/> @@ -428,20 +441,22 @@ android:src="@drawable/route_speaker" android:background="@drawable/button_background" android:visibility="invisible" - android:padding="20dp" + android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1.4"/> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_toggle_speaker"/> + android:layout_weight="1.4" + android:contentDescription="@string/content_description_conference"/> diff --git a/res/layout-sw533dp-land/call_incoming.xml b/res/layout-sw533dp-land/call_incoming.xml index 43392d1eb..61310581e 100644 --- a/res/layout-sw533dp-land/call_incoming.xml +++ b/res/layout-sw533dp-land/call_incoming.xml @@ -175,7 +175,6 @@ android:layout_height="wrap_content" android:alpha="0.2"/> - + android:visibility="invisible" + android:layout_alignParentTop="true"/> @@ -85,6 +85,7 @@ android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/chat_list_indicator" + android:contentDescription="@string/content_description_unread_chat_message" style="@style/font18" android:gravity="center" android:singleLine="true" diff --git a/res/layout-sw533dp-land/dialer.xml b/res/layout-sw533dp-land/dialer.xml index cf3875d5f..b2d68e2c6 100644 --- a/res/layout-sw533dp-land/dialer.xml +++ b/res/layout-sw533dp-land/dialer.xml @@ -30,6 +30,7 @@ + android:visibility="invisible" + android:layout_alignParentTop="true"/> @@ -86,6 +86,7 @@ android:layout_width="20dp" android:layout_height="20dp" android:background="@drawable/chat_list_indicator" + android:contentDescription="@string/content_description_unread_chat_message" style="@style/font18" android:gravity="center" android:singleLine="true" diff --git a/res/layout-sw533dp/dialer.xml b/res/layout-sw533dp/dialer.xml index 85eadecaa..6b027aece 100644 --- a/res/layout-sw533dp/dialer.xml +++ b/res/layout-sw533dp/dialer.xml @@ -29,6 +29,7 @@ - @@ -111,6 +111,7 @@ @@ -80,6 +81,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_username_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> diff --git a/res/layout/assistant_login.xml b/res/layout/assistant_login.xml index 0cf94cf8f..5ae935206 100644 --- a/res/layout/assistant_login.xml +++ b/res/layout/assistant_login.xml @@ -46,6 +46,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="text|textEmailAddress" + android:contentDescription="@string/content_description_username_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> @@ -80,6 +81,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_domain_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> @@ -97,6 +99,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textEmailAddress" + android:contentDescription="@string/content_description_display_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> diff --git a/res/layout/assistant_remote_provisioning.xml b/res/layout/assistant_remote_provisioning.xml index e9e1b601e..483131e1e 100644 --- a/res/layout/assistant_remote_provisioning.xml +++ b/res/layout/assistant_remote_provisioning.xml @@ -42,6 +42,7 @@ android:background="@drawable/resizable_textfield" android:textColor="@color/colorB" android:inputType="textUri" + android:contentDescription="@string/content_description_url_field" android:layout_width="match_parent" android:layout_height="40dp" android:singleLine="true"/> diff --git a/res/layout/assistant_topbar.xml b/res/layout/assistant_topbar.xml index 8af0b24db..328598743 100644 --- a/res/layout/assistant_topbar.xml +++ b/res/layout/assistant_topbar.xml @@ -29,7 +29,7 @@ android:id="@+id/assistant_cancel" android:src="@drawable/dialer_back" android:background="@drawable/toolbar_button" - android:contentDescription="@string/content_description_dialer" + android:contentDescription="@string/content_description_dialer_back" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" diff --git a/res/layout/call.xml b/res/layout/call.xml index 69cbf91a0..280bdb653 100644 --- a/res/layout/call.xml +++ b/res/layout/call.xml @@ -208,6 +208,7 @@ android:id="@+id/video" android:src="@drawable/camera_button" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_switch_video" android:padding="20dp" android:layout_width="match_parent" android:layout_height="wrap_content"/> @@ -227,6 +228,7 @@ android:id="@+id/micro" android:src="@drawable/micro_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_micro" android:padding="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -236,6 +238,7 @@ android:id="@+id/speaker" android:src="@drawable/speaker_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_speaker" android:padding="15dp" android:layout_width="match_parent" android:layout_height="match_parent" @@ -245,6 +248,7 @@ android:id="@+id/audio_route" android:src="@drawable/routes_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_audio_route" android:visibility="gone" android:padding="15dp" android:layout_width="match_parent" @@ -255,6 +259,7 @@ android:id="@+id/options" android:src="@drawable/options_default" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_call_options" android:padding="15dp" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -273,6 +278,7 @@ android:id="@+id/dialer" android:src="@drawable/footer_dialer" android:background="@color/colorC" + android:contentDescription="@string/content_description_numpad" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.8" @@ -282,6 +288,7 @@ android:id="@+id/hang_up" android:src="@drawable/call_hangup" android:background="@drawable/hangup" + android:contentDescription="@string/content_description_hang_up" android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -292,6 +299,7 @@ android:id="@+id/chat" android:src="@drawable/footer_chat" android:background="@color/colorC" + android:contentDescription="@string/content_description_chat_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.8" @@ -323,6 +331,7 @@ android:id="@+id/route_bluetooth" android:src="@drawable/route_bluetooth" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_bluetooth" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -333,6 +342,7 @@ android:id="@+id/add_call" android:src="@drawable/options_add_call_button" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_add_call" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -364,6 +374,7 @@ android:id="@+id/route_earpiece" android:src="@drawable/route_earpiece" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_earpiece" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -374,6 +385,7 @@ android:id="@+id/transfer" android:src="@drawable/options_transfer_call_button" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_transfer" android:padding="15dp" android:visibility="invisible" android:layout_width="match_parent" @@ -404,6 +416,7 @@ android:id="@+id/route_speaker" android:src="@drawable/route_speaker" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_toggle_speaker" android:visibility="invisible" android:padding="15dp" android:layout_width="match_parent" @@ -414,6 +427,7 @@ android:id="@+id/conference" android:src="@drawable/options_start_conference_button" android:background="@drawable/button_background" + android:contentDescription="@string/content_description_conference" android:visibility="invisible" android:padding="15dp" android:layout_width="match_parent" diff --git a/res/layout/chat.xml b/res/layout/chat.xml index 46e5dba17..1964fa8d6 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -15,6 +15,7 @@ android:id="@+id/back" android:src="@drawable/back" android:background="@drawable/toolbar_button" + android:contentDescription="@string/content_description_back" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" @@ -45,6 +46,7 @@ android:id="@+id/back_to_call" android:src="@drawable/call_back" android:background="@drawable/toolbar_button" + android:contentDescription="@string/content_description_back_call" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" @@ -55,7 +57,7 @@ android:id="@+id/edit" android:src="@drawable/edit_list_button" android:background="@drawable/toolbar_button" - android:contentDescription="@string/content_description_edit" + android:contentDescription="@string/content_description_edit_list" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" @@ -81,6 +83,7 @@ diff --git a/res/layout/chatlist.xml b/res/layout/chatlist.xml index 24eaf650e..6fcdfb3a2 100644 --- a/res/layout/chatlist.xml +++ b/res/layout/chatlist.xml @@ -26,7 +26,7 @@ android:id="@+id/back_in_call" android:src="@drawable/call_back" android:background="@drawable/toolbar_button" - android:contentDescription="@string/content_description_call" + android:contentDescription="@string/content_description_back_call" android:visibility="invisible" android:layout_width="0dp" android:layout_height="match_parent" @@ -42,7 +42,7 @@ android:id="@+id/edit" android:src="@drawable/edit_list_button" android:background="@drawable/toolbar_button" - android:contentDescription="@string/content_description_edit" + android:contentDescription="@string/content_description_edit_list" android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.2" diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml index acf2120eb..b49f44fad 100644 --- a/res/layout/chatlist_cell.xml +++ b/res/layout/chatlist_cell.xml @@ -47,7 +47,6 @@ @@ -85,6 +84,7 @@ android:id="@+id/unreadMessages" android:layout_width="20dp" android:layout_height="20dp" + android:contentDescription="@string/content_description_unread_chat_message" android:background="@drawable/chat_list_indicator" style="@style/font18" android:gravity="center" diff --git a/res/layout/conf_call_control_row.xml b/res/layout/conf_call_control_row.xml index 736582f21..4c8fd365f 100644 --- a/res/layout/conf_call_control_row.xml +++ b/res/layout/conf_call_control_row.xml @@ -49,6 +49,7 @@ @@ -101,6 +103,7 @@ diff --git a/res/layout/main.xml b/res/layout/main.xml index e8bdcd4e8..3656b91a0 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -42,6 +42,7 @@ @@ -121,6 +123,7 @@ diff --git a/res/layout/status.xml b/res/layout/status.xml index 1833577bd..314c3d9e2 100644 --- a/res/layout/status.xml +++ b/res/layout/status.xml @@ -14,6 +14,7 @@ Starting up %s registered %s failed to register - Linphone Android %s - Linphone Core %s - GNU General Public License V2\n © 2010-2016 Belledonne Communications - www.linphone.org - - linphone contacts - - EEE, d MMM - yyyy/MM/dd - HH:mm - - dd/MM, HH:mm - dd/MM - HH:mm - linphone-mms-%s.jpg @@ -308,26 +295,30 @@ Back Dialer + Menu Toggle micro Toggle speaker Decline Hang up Accept - Edit button - Valid button + Edit + Edit List + Valid Add to contacts New contact Call Backspace Chat Dial back + Return to dialer Contact picture Send message Details - Delete button - Add button + Delete + Add call New discussion Search + Search contact All contacts Linphone contacts Call direction @@ -346,4 +337,26 @@ Cancel button Message status Conference + Username field + Display name field + Domain field + Remote provisioning field + Confirm password field + Email field + Default account + Deselect all + Select all + Select all + First name + Last name + Back to call + Send a file + Message + Unread chat message + Transfer + Earpiece + Bluetooth + Call options + Audio route + Exit conference