Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Automatically accept video from correspondent preference added

Browse source
This commit is contained in:
Sylvain Berfini 2012-02-29 16:58:16 +01:00
parent 0308e07f0e
commit ce089b16a7
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/non_localizable_strings.xml
View file

@ -46,6 +46,7 @@
<string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string> <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
<string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string> <string name="pref_video_codec_h264_key">pref_video_codec_h264_key</string>
<string name="pref_video_automatically_share_my_video_key">pref_video_automatically_share_my_video_key</string> <string name="pref_video_automatically_share_my_video_key">pref_video_automatically_share_my_video_key</string>
<string name="pref_video_automatically_accept_video_key">pref_video_automatically_accept_video_key</string>
<string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string> <string name="pref_video_initiate_call_with_video_key">pref_video_initiate_call_with_video_key</string>
<string name="pref_video_enable_key">pref_video_enable_key</string> <string name="pref_video_enable_key">pref_video_enable_key</string>
<string name="pref_escape_plus_key">pref_escape_plus_key</string> <string name="pref_escape_plus_key">pref_escape_plus_key</string>

2
res/values/strings.xml
View file

@ -136,7 +136,9 @@
<string name="menu_videocall_terminate_call_title">Terminate call</string> <string name="menu_videocall_terminate_call_title">Terminate call</string>
<string name="pref_video_settings_title">Video settings</string> <string name="pref_video_settings_title">Video settings</string>
<string name="pref_video_automatically_share_my_video_title">Share my camera</string> <string name="pref_video_automatically_share_my_video_title">Share my camera</string>
<string name="pref_video_automatically_accept_video_title">Accept incoming camera</string>
<string name="pref_video_automatically_share_my_video">Automatically send my camera</string> <string name="pref_video_automatically_share_my_video">Automatically send my camera</string>
<string name="pref_video_automatically_accept_video">Automatically accept correspondent\'s camera</string>
<string name="pref_video_initiate_call_with_video_title">Initiate video calls</string> <string name="pref_video_initiate_call_with_video_title">Initiate video calls</string>
<string name="pref_video_initiate_call_with_video"></string> <string name="pref_video_initiate_call_with_video"></string>
<string name="pref_video_enable_title">Enable Video</string> <string name="pref_video_enable_title">Enable Video</string>

6
res/xml/preferences.xml
View file

@ -122,6 +122,12 @@
android:title="@string/pref_video_automatically_share_my_video_title" android:title="@string/pref_video_automatically_share_my_video_title"
android:defaultValue="true" android:summary="@string/pref_video_automatically_share_my_video" android:defaultValue="true" android:summary="@string/pref_video_automatically_share_my_video"
android:dependency="@string/pref_video_enable_key"></CheckBoxPreference> android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
<CheckBoxPreference
android:key="@string/pref_video_automatically_accept_video_key"
android:title="@string/pref_video_automatically_accept_video_title"
android:defaultValue="true" android:summary="@string/pref_video_automatically_accept_video"
android:dependency="@string/pref_video_enable_key"></CheckBoxPreference>
<PreferenceScreen android:dependency="@string/pref_video_enable_key" <PreferenceScreen android:dependency="@string/pref_video_enable_key"
android:shouldDisableView="true" android:key="@string/pref_video_codecs_key" android:shouldDisableView="true" android:key="@string/pref_video_codecs_key"

4
src/org/linphone/LinphoneManager.java
View file

@ -1097,6 +1097,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
public boolean shareMyCamera() { public boolean shareMyCamera() {
return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false); return isVideoEnabled() && getPrefBoolean(R.string.pref_video_automatically_share_my_video_key, false);
} }
public boolean autoAcceptCamera() {
return getPrefBoolean(R.string.pref_video_automatically_accept_video_key, false);
}
public void setAudioModeIncallForGalaxyS() { public void setAudioModeIncallForGalaxyS() {
mAudioManager.setMode(MODE_IN_CALL); mAudioManager.setMode(MODE_IN_CALL);