diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml index dee1dc45f..4fa3406bb 100644 --- a/res/layout/incoming.xml +++ b/res/layout/incoming.xml @@ -1,17 +1,22 @@ + android:layout_height="match_parent"> - + @@ -85,28 +90,23 @@ + android:padding="15dp"/> - - - + android:padding="15dp"/> diff --git a/res/layout/outgoing_call.xml b/res/layout/outgoing_call.xml index 52f75916b..af78e376e 100644 --- a/res/layout/outgoing_call.xml +++ b/res/layout/outgoing_call.xml @@ -1,17 +1,23 @@ - + @@ -90,9 +96,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:adjustViewBounds="true" android:contentDescription="@string/content_description_pause" - android:scaleType="center"/> + android:padding="15dp"/> + android:padding="20dp"/> + android:padding="15dp"/> diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java index ef15937dc..d6e1319d6 100644 --- a/src/org/linphone/IncomingCallActivity.java +++ b/src/org/linphone/IncomingCallActivity.java @@ -27,11 +27,9 @@ import org.linphone.core.LinphoneCallParams; import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.mediastream.Log; -import org.linphone.ui.LinphoneSliders; import org.linphone.ui.LinphoneSliders.LinphoneSliderTriggered; import android.app.Activity; -import android.net.Uri; import android.os.Bundle; import android.view.KeyEvent; import android.view.View; @@ -55,6 +53,7 @@ public class IncomingCallActivity extends Activity implements LinphoneSliderTrig private ImageView mPictureView; private LinphoneCall mCall; private LinphoneCoreListenerBase mListener; + private StatusFragment status; public static IncomingCallActivity instance() { return instance; @@ -66,6 +65,8 @@ public class IncomingCallActivity extends Activity implements LinphoneSliderTrig @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); setContentView(R.layout.incoming); @@ -171,7 +172,9 @@ public class IncomingCallActivity extends Activity implements LinphoneSliderTrig return super.onKeyDown(keyCode, event); } - + public void updateStatusFragment(StatusFragment fragment) { + status = fragment; + } private void decline() { LinphoneManager.getLc().terminateCall(mCall); diff --git a/src/org/linphone/OutgoingCallActivity.java b/src/org/linphone/OutgoingCallActivity.java index 3059981e5..e82e0d303 100644 --- a/src/org/linphone/OutgoingCallActivity.java +++ b/src/org/linphone/OutgoingCallActivity.java @@ -55,6 +55,7 @@ public class OutgoingCallActivity extends Activity { private LinphoneCall mCall; private LinphoneCoreListenerBase mListener; private boolean isMicMuted, isSpeakerEnabled; + private StatusFragment status; public static OutgoingCallActivity instance() { return instance; @@ -64,8 +65,14 @@ public class OutgoingCallActivity extends Activity { return instance != null; } + public void updateStatusFragment(StatusFragment fragment) { + status = fragment; + } + @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); setContentView(R.layout.outgoing_call);