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

Fix conference view and add chali list view

Browse source
This commit is contained in:
Margaux Clerc 2015-09-18 19:16:14 +02:00
parent c6035e841f
commit 6f180fc307
3 changed files with 13 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone"
android:versionCode="2510" android:installLocation="auto">
android:versionCode="2599" android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22"/>
<!-- Permissions for Push Notification -->

55
res/layout/chatlist.xml
View file

@ -6,6 +6,7 @@
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/top_bar"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_gravity="top"
@ -13,70 +14,32 @@
<ImageView
android:id="@+id/new_discussion"
android:contentDescription="@string/content_description_new_discussion"
android:src="@drawable/chat_add"
android:background="@drawable/toolbar_button"
android:layout_width="wrap_content"
android:contentDescription="@string/content_description_new_discussion"
android:layout_width="70dp"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:padding="10dp"
android:adjustViewBounds="true"/>
<ImageView
android:id="@+id/delete"
android:src="@drawable/delete"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:padding="10dp"
android:adjustViewBounds="true"
android:visibility="gone"/>
<ImageView
android:id="@+id/select_all"
android:src="@drawable/select_all"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/delete"
android:padding="10dp"
android:adjustViewBounds="true"
android:visibility="gone"/>
<ImageView
android:id="@+id/deselect_all"
android:src="@drawable/deselect_all"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_valid"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/delete"
android:padding="10dp"
android:adjustViewBounds="true"
android:visibility="gone"/>
android:padding="15dp"/>
<ImageView
android:id="@+id/edit"
android:src="@drawable/edit_list_button"
android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit"
android:layout_width="wrap_content"
android:layout_width="70dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:padding="10dp"
android:adjustViewBounds="true"/>
android:padding="15dp"/>
</RelativeLayout>
<include layout="@layout/edit_list"/>
<ListView
android:id="@+id/chatList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@android:color/darker_gray"
android:divider="@color/colorE"
android:cacheColorHint="@color/transparent"
android:dividerHeight="1dp" />

5
src/org/linphone/InCallActivity.java
View file

@ -1355,7 +1355,6 @@ public class InCallActivity extends Activity implements OnClickListener {
}
private void displayOtherCalls(Resources resources, final LinphoneCall call, int index) {
Log.w("Display other calls");
String sipUri = call.getRemoteAddress().asStringUriOnly();
LinphoneAddress lAddress;
try {
@ -1507,7 +1506,7 @@ public class InCallActivity extends Activity implements OnClickListener {
}
}
if (LinphoneManager.getLc().getCurrentCall() == null) {
if (LinphoneManager.getLc().getCurrentCall() == null && !isConferenceRunning ) {
showAudioView();
mActiveCallHeader.setVisibility(View.GONE);
mNoCurrentCall.setVisibility(View.VISIBLE);
@ -1535,6 +1534,7 @@ public class InCallActivity extends Activity implements OnClickListener {
private void enterConference() {
LinphoneManager.getLc().addAllToConference();
displayConferenceHeader();
mNoCurrentCall.setVisibility(View.GONE);
displayOrHideCallsHeader(false);
}
@ -1587,6 +1587,7 @@ public class InCallActivity extends Activity implements OnClickListener {
mControlsLayout.setVisibility(View.VISIBLE);
LinphoneManager.startProximitySensorForActivity(InCallActivity.this);
mActiveCallHeader.setVisibility(View.GONE);
mNoCurrentCall.setVisibility(View.GONE);
callsList.setVisibility(View.VISIBLE);
conferenceList.removeAllViews();