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

Better conference callee appearance.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-09-30 11:39:04 +02:00
parent c655746a1f
commit f8892448ad
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/layout/conf_callee.xml
View file

@ -30,7 +30,7 @@
<LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons" <LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons"
android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_width="wrap_content" android:layout_height="fill_parent"
android:layout_centerVertical="true"> android:layout_centerVertical="true">
<TextView android:id="@+id/status_label" style="@style/callee_status"/> <TextView android:id="@+id/status_label" style="@style/callee_status" />
<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" /> <ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" />
<ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status" android:src="@drawable/conf_status_inconf"/> <ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status" android:src="@drawable/conf_status_inconf"/>
</LinearLayout> </LinearLayout>

6
res/values/callee_style.xml
View file

@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="callee_name" parent="@android:style/TextAppearance.Medium"> <style name="callee_name" parent="@android:style/TextAppearance.Large">
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:gravity">fill_vertical</item>
</style> </style>
<style name="callee_address" parent="@android:style/TextAppearance"> <style name="callee_address" parent="@android:style/TextAppearance.Medium">
<item name="android:layout_width">fill_parent</item> <item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item> <item name="android:layout_height">fill_parent</item>
<item name="android:layout_weight">1</item> <item name="android:layout_weight">1</item>
<item name="android:gravity">fill_vertical</item>
</style> </style>
<style name="callee_status"> <style name="callee_status">

17
src/org/linphone/ConferenceActivity.java
View file

@ -44,6 +44,7 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
@ -418,10 +419,18 @@ public class ConferenceActivity extends ListActivity implements
final LinphoneCall call = linphoneCalls.get(position); final LinphoneCall call = linphoneCalls.get(position);
final LinphoneCall.State state = call.getState(); final LinphoneCall.State state = call.getState();
((TextView) v.findViewById(R.id.name)).setText(call String mainText = call.getRemoteAddress().getDisplayName();
.getRemoteAddress().getDisplayName()); String complText = call.getRemoteAddress().getUserName();
((TextView) v.findViewById(R.id.address)).setText(call TextView mainTextView = (TextView) v.findViewById(R.id.name);
.getRemoteAddress().getUserName()); TextView complTextView = (TextView) v.findViewById(R.id.address);
if (TextUtils.isEmpty(mainText)) {
mainTextView.setText(complText);
complTextView.setVisibility(View.GONE);
} else {
mainTextView.setText(mainText);
complTextView.setText(complText);
complTextView.setVisibility(View.VISIBLE);
}
final boolean isInConference = call.isInConference(); final boolean isInConference = call.isInConference();
boolean currentlyActiveCall = !isInConference boolean currentlyActiveCall = !isInConference