call: numeric keyboard, sipinfo dtmf
This patch reintroduces the numeric keyboard in call.
It sets the DTMF type to sipinfo, since overrtp is not supported by
the daemon yet. This change is performed for all accounts at creation
or when they are loaded.
These actions will have to be removed once the overrtp support is do-
ne.
Change-Id: I60775a8cfc987ae374abaa5e37e752517b36ee9b
Tuleap: #618
diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml
index 6443674..1408a13 100644
--- a/ring-android/app/src/main/res/layout/frag_call.xml
+++ b/ring-android/app/src/main/res/layout/frag_call.xml
@@ -198,5 +198,14 @@
android:visibility="gone" />
</RelativeLayout>
+
+ <EditText
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:inputType="phone"
+ android:ems="10"
+ android:id="@+id/dialpad_edit_text"
+ android:visibility="visible" />
+
</FrameLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/menu/ac_call.xml b/ring-android/app/src/main/res/menu/ac_call.xml
index 6f78d8e..2be2950 100644
--- a/ring-android/app/src/main/res/menu/ac_call.xml
+++ b/ring-android/app/src/main/res/menu/ac_call.xml
@@ -4,7 +4,7 @@
<item
android:id="@+id/menuitem_chat"
- app:showAsAction="always"
+ app:showAsAction="ifRoom"
android:icon="@drawable/ic_chat_white_24dp"
android:title="@string/ab_action_chat"/>
@@ -24,7 +24,13 @@
<item
android:id="@+id/menuitem_addcontact"
- app:showAsAction="always"
+ app:showAsAction="ifRoom"
android:icon="@drawable/ic_person_add_white_24dp"
android:title="@string/ab_action_contact_add"/>
+
+ <item
+ android:id="@+id/menuitem_dialpad"
+ app:showAsAction="ifRoom"
+ android:icon="@drawable/ic_dialpad_white_24dp"
+ android:title="@string/dial_numeric_pad"/>
</menu>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/arrays.xml b/ring-android/app/src/main/res/values/arrays.xml
index dbc2806..b213d71 100644
--- a/ring-android/app/src/main/res/values/arrays.xml
+++ b/ring-android/app/src/main/res/values/arrays.xml
@@ -42,8 +42,8 @@
</string-array>
<string-array name="dtmf_types_values" translatable="false">
- <item>overrtp</item>
- <item>sipinfo</item>
+ <item>@string/account_sip_dtmf_type_overrtp</item>
+ <item>@string/account_sip_dtmf_type_sipinfo</item>
</string-array>
<string-array name="dtmf_types_entries" translatable="false">
<item>RTP</item>
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index 899940a..3e867ea 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -102,6 +102,9 @@
<string name="account_preferences_security_tab">Security</string>
<string name="account_srtp_deactivated">Deactivated</string>
+ <!-- SIP -->
+ <string name="account_sip_dtmf_type_sipinfo" translatable="false">sipinfo</string>
+ <string name="account_sip_dtmf_type_overrtp" translatable="false">overrtp</string>
<!-- TLS Details -->
<string name="account_tls_transport_switch_label">Use TLS Transport</string>
diff --git a/ring-android/app/src/main/res/values/strings_call.xml b/ring-android/app/src/main/res/values/strings_call.xml
new file mode 100644
index 0000000..b591eb0
--- /dev/null
+++ b/ring-android/app/src/main/res/values/strings_call.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+ <!-- SipCalls -->
+ <string name="call_human_state_incoming">Ringing</string>
+ <string name="call_human_state_connecting">Connecting</string>
+ <string name="call_human_state_ringing">Calling</string>
+ <string name="call_human_state_current">Talking</string>
+ <string name="call_human_state_hungup">Over</string>
+ <string name="call_human_state_busy">Busy</string>
+ <string name="call_human_state_failure">Failed</string>
+ <string name="call_human_state_hold">Hold</string>
+ <string name="call_human_state_unhold">Unhold</string>
+ <string name="call_human_state_over">Over</string>
+ <string name="call_human_state_none">None</string>
+ <!-- Conferences -->
+ <string name="conference_human_state_active_attached">Active attached</string>
+ <string name="conference_human_state_active_detached">Active detached</string>
+ <string name="conference_human_state_active_attached_rec">Active attached rec</string>
+ <string name="conference_human_state_active_detached_rec">Active detached rec</string>
+ <string name="conference_human_state_hold">Hold</string>
+ <string name="conference_human_state_hold_rec">Hold rec</string>
+ <string name="conference_human_state_default">None</string>
+</resources>
\ No newline at end of file