From 7000bc4b3d19943225541e6f05cb0bfd72e24ea1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 17 Dec 2012 13:56:59 +0100 Subject: [PATCH] Use marquee in contact view for long sip addresses --- res/layout/contact_control_row.xml | 5 +++++ src/org/linphone/ChatFragment.java | 2 ++ src/org/linphone/ContactFragment.java | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml index 9f7e41c0d..129777574 100644 --- a/res/layout/contact_control_row.xml +++ b/res/layout/contact_control_row.xml @@ -12,6 +12,11 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" + android:ellipsize="marquee" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:fadingEdge="horizontal" + android:singleLine="true" android:textColor="@android:color/black" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="left" /> diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index b6394f4c3..caa3b18b0 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -209,6 +209,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC // Workaround for SGS3 issue if (savedInstanceState != null) { fileToUploadPath = savedInstanceState.getString("fileToUploadPath"); + imageToUpload = savedInstanceState.getParcelable("imageToUpload"); } if (fileToUploadPath != null || imageToUpload != null) { sendImage.post(new Runnable() { @@ -225,6 +226,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC @Override public void onSaveInstanceState(Bundle outState) { outState.putString("fileToUploadPath", fileToUploadPath); + outState.putParcelable("imageToUpload", imageToUpload); super.onSaveInstanceState(outState); } diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java index 2c0edd580..961ba9394 100644 --- a/src/org/linphone/ContactFragment.java +++ b/src/org/linphone/ContactFragment.java @@ -103,7 +103,10 @@ public class ContactFragment extends Fragment implements OnClickListener { if (numberOrAddress.startsWith("sip:")) { displayednumberOrAddress = displayednumberOrAddress.substring(4); } - ((TextView) v.findViewById(R.id.numeroOrAddress)).setText(displayednumberOrAddress); + + TextView tv = (TextView) v.findViewById(R.id.numeroOrAddress); + tv.setText(displayednumberOrAddress); + tv.setSelected(true); if (!displayChatAddressOnly) { v.findViewById(R.id.dial).setOnClickListener(dialListener);