From 530ede085b3a111877be6c90bb8d15eada0ce8e1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 1 Aug 2018 11:28:40 +0200 Subject: [PATCH] Fix somethings --- res/values-fr/strings.xml | 2 +- src/android/org/linphone/call/CallIncomingActivity.java | 2 ++ src/android/org/linphone/call/CallOutgoingActivity.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 90418d88f..97ee0b7d0 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -137,7 +137,7 @@ Vos amis pourront vous joindre plus facilement si vous associez votre compte à La période d\'essai se terminera le %s L\'abonnement se terminera le %s - Entrez un numéro ou une adresse + Entrez une adresse Aucun appel dans votre historique Aucun appel manqué dans votre historique diff --git a/src/android/org/linphone/call/CallIncomingActivity.java b/src/android/org/linphone/call/CallIncomingActivity.java index 8dcfbe18f..be5c9afaa 100644 --- a/src/android/org/linphone/call/CallIncomingActivity.java +++ b/src/android/org/linphone/call/CallIncomingActivity.java @@ -90,6 +90,8 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin number = (TextView) findViewById(R.id.contact_number); contactPicture = (ImageView) findViewById(R.id.contact_picture); + number.setVisibility(View.GONE); + // set this flag so this activity will stay in front of the keyguard int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON; getWindow().addFlags(flags); diff --git a/src/android/org/linphone/call/CallOutgoingActivity.java b/src/android/org/linphone/call/CallOutgoingActivity.java index 6b452c925..9b71192d7 100644 --- a/src/android/org/linphone/call/CallOutgoingActivity.java +++ b/src/android/org/linphone/call/CallOutgoingActivity.java @@ -86,6 +86,8 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC number = (TextView) findViewById(R.id.contact_number); contactPicture = (ImageView) findViewById(R.id.contact_picture); + number.setVisibility(View.GONE); + isMicMuted = false; isSpeakerEnabled = false;