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

Incall activity detail buttons

Browse source 
Clicking small imageviews on Android 1.5 is nearly impossible.
This commit is contained in:
Guillaume Beraudo 2011-11-30 12:29:05 +01:00
parent afb8f8da93
commit 4c9e604f88
5 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable/conf_details.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 968 B

1
res/layout/conf_callee.xml
View file

@ -27,6 +27,7 @@
<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status" android:src="@drawable/conf_secured" android:visibility="gone"/> <ImageView android:id="@+id/callee_status_secured" style="@style/callee_status" android:src="@drawable/conf_secured" android:visibility="gone"/>
<ImageView android:id="@+id/callee_status_maybe_secured" style="@style/callee_status" android:src="@drawable/conf_maybe_secured" android:visibility="gone"/> <ImageView android:id="@+id/callee_status_maybe_secured" style="@style/callee_status" android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status" android:src="@drawable/conf_not_secured" android:visibility="gone"/> <ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status" android:src="@drawable/conf_not_secured" android:visibility="gone"/>
<ImageView android:id="@+id/callee_status_details" style="@style/callee_status" android:src="@drawable/conf_details" android:visibility="gone"/>
</LinearLayout> </LinearLayout>

21
res/layout/conf_callee_older_devices.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="52sp" android:layout_width="fill_parent" android:layout_height="52sp"
android:background="@drawable/conf_callee_bg"> android:background="@drawable/conf_callee_bg">
<ImageView android:id="@+id/picture" android:layout_width="52sp" <ImageView android:id="@+id/picture" android:layout_width="52sp"
android:src="@drawable/unknown_person" android:layout_height="52sp" android:src="@drawable/unknown_person" android:layout_height="52sp"
android:paddingLeft="5px" android:scaleType="centerInside"/> android:paddingRight="5dp" android:paddingLeft="5dp" android:scaleType="centerInside"/>
<LinearLayout android:id="@+id/callee_block" android:orientation="vertical" <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
@ -19,19 +19,16 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View android:layout_height="fill_parent" android:layout_width="wrap_content" android:layout_weight="1"/>
<ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video" <LinearLayout android:id="@+id/callee_statuses"
android:layout_width="wrap_content" android:layout_height="wrap_content" /> android:layout_width="wrap_content" android:layout_height="wrap_content"
<ImageButton android:id="@+id/merge_to_conference" android:layout_alignParentRight="true" android:gravity="center_vertical">
android:src="@drawable/conf_merge" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/status_label" style="@style/callee_status" <TextView android:id="@+id/status_label" style="@style/callee_status"
android:layout_height="fill_parent" /> android:layout_height="fill_parent" />
<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" <ImageView android:id="@+id/callee_status_paused" style="@style/callee_status"
android:src="@drawable/conf_status_paused" /> android:src="@drawable/conf_status_paused" android:visibility="gone" />
<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status" <ImageView android:id="@+id/callee_status_secured" style="@style/callee_status"
android:src="@drawable/conf_secured" android:visibility="gone"/> android:src="@drawable/conf_secured" android:visibility="gone"/>
@ -39,4 +36,8 @@
android:src="@drawable/conf_maybe_secured" android:visibility="gone"/> android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status" <ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status"
android:src="@drawable/conf_not_secured" android:visibility="gone"/> android:src="@drawable/conf_not_secured" android:visibility="gone"/>
</LinearLayout>
<ImageButton android:id="@+id/callee_status_details" style="@style/callee_status"
android:src="@drawable/conf_details" android:visibility="gone"/>
</LinearLayout>
</RelativeLayout>

7
res/layout/incall_layout.xml
View file

@ -7,14 +7,17 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true" <LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
android:orientation="vertical" android:layout_marginBottom="10dip" android:layout_marginBottom="10dip"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true" android:layout_alignWithParentIfMissing="true"
android:minHeight="60sp" android:minHeight="60sp"
android:background="@drawable/conf_callee_selector_normal" > android:background="@drawable/conf_callee_selector_normal" >
<TextView android:text="@string/conf_conference" style="@style/callee_address" <TextView android:text="@string/conf_conference" style="@style/callee_address"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:gravity="center"/> android:gravity="center" android:layout_gravity="center_vertical" />
<ImageButton android:id="@+id/conf_header_details"
android:layout_width="wrap_content" android:layout_height="fill_parent"
android:scaleType="center" android:src="@drawable/conf_details"/>
</LinearLayout> </LinearLayout>

14
src/org/linphone/IncallActivity.java
View file

@ -109,6 +109,8 @@ public class IncallActivity extends AbstractCalleesActivity implements
mConferenceVirtualCallee = findViewById(R.id.conf_header); mConferenceVirtualCallee = findViewById(R.id.conf_header);
mConferenceVirtualCallee.setOnClickListener(this); mConferenceVirtualCallee.setOnClickListener(this);
mConferenceVirtualCallee.setOnLongClickListener(this); mConferenceVirtualCallee.setOnLongClickListener(this);
enableView(mConferenceVirtualCallee, R.id.conf_header_details, this, true);
boolean mMayDoVideo = Version.isVideoCapable() boolean mMayDoVideo = Version.isVideoCapable()
&& LinphoneManager.getInstance().isVideoEnabled(); && LinphoneManager.getInstance().isVideoEnabled();
@ -216,7 +218,12 @@ public class IncallActivity extends AbstractCalleesActivity implements
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
if (v.getId() == R.id.conf_header) { if (v.getId() == R.id.conf_header || v.getId() == R.id.conf_header_details) {
if (!lc().isInConference()) {
// make sure we are in the conference
// especially due to the difficulty to aim at the detail button.
lc().enterConference();
}
LinphoneActivity.instance().startConferenceDetailsActivity(); LinphoneActivity.instance().startConferenceDetailsActivity();
return true; return true;
} }
@ -260,6 +267,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
boolean enterConf = !lc().isInConference(); boolean enterConf = !lc().isInConference();
enterConferenceAndVirtualConfView(enterConf); enterConferenceAndVirtualConfView(enterConf);
break; break;
case R.id.conf_header_details:
onLongClick(v);
break;
case R.id.incallNumpadShow: case R.id.incallNumpadShow:
showDialog(numpadDialogId); showDialog(numpadDialogId);
break; break;
@ -527,6 +537,8 @@ public class IncallActivity extends AbstractCalleesActivity implements
registerCallDurationTimer(v, call); registerCallDurationTimer(v, call);
enableView(v, R.id.callee_status_details, showCallActionsSimpleListener, true);
return v; return v;
} }
} }