Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix video call button

Browse source
This commit is contained in:
Margaux Clerc 2016-03-02 17:53:34 +01:00
parent 917b5eb329
commit d9fe5be063
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/layout-land/call.xml
View file

@ -257,7 +257,6 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:background="@drawable/button_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
@ -304,7 +303,7 @@
android:src="@drawable/routes_default" android:src="@drawable/routes_default"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:visibility="gone" android:visibility="gone"
android:padding="15dp" android:padding="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
@ -428,7 +427,7 @@
android:src="@drawable/route_speaker" android:src="@drawable/route_speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:visibility="invisible" android:visibility="invisible"
android:padding="15dp" android:padding="20dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1.4"/> android:layout_weight="1.4"/>

6
res/layout-land/call_outgoing.xml
View file

@ -35,8 +35,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@id/menu" android:layout_above="@id/menu"
android:layout_below="@id/top_bar" android:paddingTop="10dp"
android:paddingTop="10dp"> android:layout_below="@+id/top_bar">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
@ -122,7 +122,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:padding="12dp"/> android:padding="10dp"/>
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"

1
res/layout/call.xml
View file

@ -200,7 +200,6 @@
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:background="@drawable/button_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">

2
src/org/linphone/CallActivity.java
View file

@ -913,6 +913,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
video.setEnabled(true); video.setEnabled(true);
transfer.setVisibility(View.INVISIBLE); transfer.setVisibility(View.INVISIBLE);
addCall.setVisibility(View.INVISIBLE); addCall.setVisibility(View.INVISIBLE);
conference.setVisibility(View.INVISIBLE);
displayVideoCall(false); displayVideoCall(false);
numpad.setVisibility(View.GONE); numpad.setVisibility(View.GONE);
options.setImageResource(R.drawable.options_default); options.setImageResource(R.drawable.options_default);
@ -933,6 +934,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
video.setEnabled(true); // HACK: Used to avoid controls from being hided if video is switched while controls are hiding video.setEnabled(true); // HACK: Used to avoid controls from being hided if video is switched while controls are hiding
transfer.setVisibility(View.INVISIBLE); transfer.setVisibility(View.INVISIBLE);
addCall.setVisibility(View.INVISIBLE); addCall.setVisibility(View.INVISIBLE);
conference.setVisibility(View.INVISIBLE);
displayVideoCall(false); displayVideoCall(false);
numpad.setVisibility(View.GONE); numpad.setVisibility(View.GONE);
options.setImageResource(R.drawable.options_default); options.setImageResource(R.drawable.options_default);