diff --git a/res/layout/call.xml b/res/layout/call.xml
index 9b4ea32a6..4b360610b 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -41,6 +41,9 @@
android:id="@+id/active_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_centerHorizontal="false"
+ android:layout_centerInParent="false"
+ android:layout_centerVertical="false"
android:visibility="visible">
@@ -155,9 +158,8 @@
android:id="@+id/active_call_info"
android:layout_width="match_parent"
android:layout_height="80dp"
- android:layout_above="@+id/help_space"
- android:layout_alignParentBottom="true"
- android:layout_marginTop="5dp"
+ android:layout_above="@+id/calls_list"
+ android:layout_alignParentBottom="false"
android:alpha="0.8"
android:background="@color/colorH"
android:orientation="vertical">
@@ -180,24 +182,22 @@
/>
-
+
+
-
-
+
-
+
@@ -198,18 +198,18 @@
android:background="@drawable/footer_button"
android:src="@drawable/footer_chat"/>
-
+
diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
index 0666ea70e..7d1af44d5 100644
--- a/src/android/org/linphone/LinphoneService.java
+++ b/src/android/org/linphone/LinphoneService.java
@@ -563,7 +563,12 @@ public final class LinphoneService extends Service {
} catch (Exception e) {
bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar_small_secure1);
}
- String name = address.getDisplayName() == null ? address.getUsername() : address.getDisplayName();
+ String name;
+ if (contact != null) {
+ name = contact.getFullName() == null ? address.getUsername() : contact.getFullName();
+ } else {
+ name = address.getDisplayName() == null ? address.getUsername() : address.getDisplayName();
+ }
Intent notifIntent = new Intent(this, incomingReceivedActivity);
notifIntent.putExtra("Notification", true);
mNotifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index eb77b643b..4d7858b17 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -781,20 +781,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void enabledTransferButton(boolean enabled){
if(enabled) {
transfer.setEnabled(true);
- transfer.setAlpha(1f);
} else {
transfer.setEnabled(false);
- transfer.setAlpha(0.4f);
}
}
private void enabledConferenceButton(boolean enabled){
if (enabled) {
conference.setEnabled(true);
- conference.setAlpha(1f);
} else {
conference.setEnabled(false);
- conference.setAlpha(0.4f);
}
}
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 3971cd85f..3f1a9e55a 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -503,7 +503,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
@Override
public void onSecurityEvent(ChatRoom cr, EventLog eventLog) {
-
+ refreshParticipantsList();
}
@Override