diff --git a/res/layout/call.xml b/res/layout/call.xml
index 3cac11f6a..bbead6b7e 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -32,17 +32,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_gravity="top"
+ android:layout_gravity="bottom"
android:orientation="vertical"
- android:visibility="gone">
-
+ android:visibility="gone">
@@ -60,7 +60,7 @@
android:layout_alignParentLeft="true"
android:contentDescription="@string/content_description_switch_camera"
android:src="@drawable/switch_camera"
- android:visibility="invisible"/>
+ android:visibility="invisible" />
+ android:src="@drawable/pause_big_default" />
+ android:src="@drawable/pause_big_default" />
+ android:src="@drawable/waiting_time" />
+ android:text="@string/call_paused_by_remote" />
@@ -158,8 +158,7 @@
android:id="@+id/active_call_info"
android:layout_width="match_parent"
android:layout_height="80dp"
- android:layout_above="@+id/calls_list"
- android:layout_alignParentBottom="false"
+ android:layout_alignParentBottom="true"
android:alpha="0.8"
android:background="@color/colorH"
android:orientation="vertical">
@@ -181,41 +180,41 @@
android:layout_gravity="center" />
-
-
-
+
+
+ android:visibility="gone">
+ android:visibility="visible" />
+ android:text="@string/no_current_call" />
diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index 3a5feb5f5..8d18dc7c6 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -1,19 +1,19 @@
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_margin="2dp"
+ android:alpha="1"
+ android:background="@color/colorM"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="5dp">
+ android:src="@drawable/avatar_big_secure1" />
+ android:textColor="#aeaeae" />
+ android:textSize="13.3sp" />
+ android:src="@drawable/pause" />
\ No newline at end of file
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index d150ad405..7c3ff1368 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1041,8 +1041,13 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
private Vibrator mVibrator;
public void onNewSubscriptionRequested(Core lc, Friend lf, String url) {}
+
+ @Override
public void onNotifyPresenceReceived(Core lc, Friend lf) {
- ContactsManager.getInstance().refreshSipContact(lf);
+ //ContactsManager.getInstance().refreshSipContact(lf);
+ if (ContactsManager.getInstance() != null) {
+ ContactsManager.getInstance().fetchContactsAsync();
+ }
}
@Override
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index e515be140..57fd3c0b3 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -886,13 +886,13 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
private void displayNoCurrentCall(boolean display){
- /*if(!display) {
+ if(!display) {
mActiveCallHeader.setVisibility(View.VISIBLE);
mNoCurrentCall.setVisibility(View.GONE);
} else {
mActiveCallHeader.setVisibility(View.GONE);
mNoCurrentCall.setVisibility(View.VISIBLE);
- }*/
+ }
}
private void displayCallPaused(boolean display){
@@ -1676,6 +1676,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
}
displayPausedCalls(resources, call, index);
index++;
+ } else if (call.getState() == State.Paused) {
+ displayPausedCalls(resources, call, index);
+ index++;
} else {
displayCurrentCall(call);
}