diff --git a/res/drawable/delete_default.png b/res/drawable/delete_default.png new file mode 100644 index 000000000..8c1843de8 Binary files /dev/null and b/res/drawable/delete_default.png differ diff --git a/res/drawable/delete_over.png b/res/drawable/delete_over.png new file mode 100644 index 000000000..bc01f8f5d Binary files /dev/null and b/res/drawable/delete_over.png differ diff --git a/res/drawable/pause_default b/res/drawable/pause_default new file mode 100644 index 000000000..0ca4db8c1 Binary files /dev/null and b/res/drawable/pause_default differ diff --git a/res/drawable/pause_over b/res/drawable/pause_over new file mode 100644 index 000000000..a2a15e52b Binary files /dev/null and b/res/drawable/pause_over differ diff --git a/res/drawable/play_default b/res/drawable/play_default new file mode 100644 index 000000000..cf455e337 Binary files /dev/null and b/res/drawable/play_default differ diff --git a/res/drawable/play_over b/res/drawable/play_over new file mode 100644 index 000000000..42d81a845 Binary files /dev/null and b/res/drawable/play_over differ diff --git a/res/layout/active_call.xml b/res/layout/active_call.xml index da2ff0643..55b853b7b 100644 --- a/res/layout/active_call.xml +++ b/res/layout/active_call.xml @@ -15,19 +15,29 @@ android:id="@+id/contactNameOrNumber" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="0.3" - android:gravity="left" + android:layout_weight="0.4" + android:gravity="center_vertical|left" android:paddingLeft="20dp" android:textColor="@android:color/white" android:textSize="22dp" /> + + diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index 41468a6f6..a97a29e67 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import org.linphone.core.LinphoneAddress; import org.linphone.core.LinphoneCall; +import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCoreFactory; import android.app.Activity; @@ -71,6 +72,13 @@ public class AudioCallFragment extends Fragment { contact.setText(lAddress.getDisplayName()); } + ImageView callState = (ImageView) callView.findViewById(R.id.callStatus); + if (call.getState() == State.Paused || call.getState() == State.PausedByRemote) { + callState.setImageResource(R.drawable.pause_default); + } else { + callState.setImageResource(R.drawable.play_default); + } + ImageView contactPicture = (ImageView) callView.findViewById(R.id.contactPicture); if (pictureUri != null) { LinphoneUtils.setImagePictureFromUri(callView.getContext(), contactPicture, Uri.parse(pictureUri.toString()), R.drawable.unknown_small); diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 69e82f461..f1a71e814 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -438,15 +438,13 @@ public class InCallActivity extends FragmentActivity implements enableAndRefreshInCallActions(); } - if (state == State.CallEnd || state == State.CallReleased || state == State.Error) { - if (audioCallFragment != null) { - mHandler.post(new Runnable() { - @Override - public void run() { - audioCallFragment.refreshCallList(getResources()); - } - }); - } + if (audioCallFragment != null) { + mHandler.post(new Runnable() { + @Override + public void run() { + audioCallFragment.refreshCallList(getResources()); + } + }); } }