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

Merge branch 'master' into 3.0.X

Browse source 
Conflicts:
	src/org/linphone/ChatFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/ui/BubbleChat.java
This commit is contained in:
Margaux Clerc 2015-08-14 11:28:42 +02:00
commit 6c2c9266e0
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,7 +296,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if (isOrientationLandscape && topBar != null) {
topBar.setVisibility(View.GONE);
}
//contactPicture.setVisibility(View.GONE);
contactPicture.setVisibility(View.GONE);
}
public void hideKeyboardVisibleMode() {

4
src/org/linphone/ui/BubbleChat.java
View file

@ -89,10 +89,6 @@ public class BubbleChat implements LinphoneChatMessage.LinphoneChatMessageListen
layoutParams.setMargins(10, 0, 10, 0);
view.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
view.setId(message.getStorageId());
view.setLayoutParams(layoutParams);
LinearLayout layout;
if (message.isOutgoing()) {
view = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.chat_bubble_outgoing, null);