diff --git a/res/layout-sw533dp/main.xml b/res/layout-sw533dp/main.xml index cff1fe36f..af0574860 100644 --- a/res/layout-sw533dp/main.xml +++ b/res/layout-sw533dp/main.xml @@ -54,8 +54,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:layout_below="@id/top_bar" android:layout_toRightOf="@+id/footer" - android:layout_toEndOf="@+id/footer"> + android:layout_below="@id/top_bar" + android:layout_above="@id/footer"> + android:orientation="horizontal"> + android:layout_width="0dp" + android:layout_height="match_parent"> @@ -111,18 +111,18 @@ @@ -132,8 +132,8 @@ android:id="@+id/contacts" android:background="@drawable/footer_button" android:layout_weight="1" - android:layout_width="60dp" - android:layout_height="0dp"> + android:layout_width="0dp" + android:layout_height="match_parent"> @@ -155,8 +155,8 @@ android:id="@+id/dialer" android:background="@drawable/footer_button" android:layout_weight="1" - android:layout_width="60dp" - android:layout_height="0dp"> + android:layout_width="0dp" + android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="5dp" + android:layout_alignParentBottom="true"/> @@ -178,8 +178,8 @@ android:id="@+id/chat" android:background="@drawable/footer_button" android:layout_weight="1" - android:layout_width="60dp" - android:layout_height="0dp"> + android:layout_width="0dp" + android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="5dp" + android:layout_alignParentBottom="true" + android:visibility="gone"/> + android:visibility="gone"/> diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index b4851882d..22e914742 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -217,15 +217,12 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC } back = (ImageView) view.findViewById(R.id.back); - if (back != null) { - back.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - getFragmentManager().popBackStackImmediate(); - } - }); + if(getResources().getBoolean(R.bool.isTablet)){ + back.setVisibility(View.INVISIBLE); + } else { + back.setOnClickListener(this); } - + mListener = new LinphoneCoreListenerBase(){ @Override public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) { @@ -704,6 +701,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC if(id == R.id.start_call){ LinphoneActivity.instance().setAddresGoToDialerAndCall(sipUri, LinphoneUtils.getUsernameFromAddress(sipUri), null); } + if (id == R.id.back) { + getFragmentManager().popBackStackImmediate(); + } } private void sendTextMessage() { diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java index 242248a33..37c81503c 100644 --- a/src/org/linphone/ContactDetailsFragment.java +++ b/src/org/linphone/ContactDetailsFragment.java @@ -102,14 +102,13 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener deleteContact = (ImageView) view.findViewById(R.id.deleteContact); deleteContact.setOnClickListener(this); - ImageView back = (ImageView) view.findViewById(R.id.back); - back.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - getFragmentManager().popBackStackImmediate(); - } - }); - + back = (ImageView) view.findViewById(R.id.back); + if(getResources().getBoolean(R.bool.isTablet)){ + back.setVisibility(View.INVISIBLE); + } else { + back.setOnClickListener(this); + } + return view; } @@ -237,7 +236,8 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener if (id == R.id.editContact) { LinphoneActivity.instance().editContact(contact); - } else if (id == R.id.deleteContact) { + } + if (id == R.id.deleteContact) { final Dialog dialog = LinphoneActivity.instance().displayDialog(getString(R.string.delete_text)); Button delete = (Button) dialog.findViewById(R.id.delete); Button cancel = (Button) dialog.findViewById(R.id.cancel); @@ -261,6 +261,9 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener }); dialog.show(); } + if (id == R.id.back) { + getFragmentManager().popBackStackImmediate(); + } } private void deleteExistingContact() { diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index 99d4015db..7fbfb8bf9 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -61,7 +61,11 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { dialBack.setOnClickListener(this); back = (ImageView) view.findViewById(R.id.back); - back.setOnClickListener(this); + if(getResources().getBoolean(R.bool.isTablet)){ + back.setVisibility(View.INVISIBLE); + } else { + back.setOnClickListener(this); + } chat = (ImageView) view.findViewById(R.id.chat); chat.setOnClickListener(this);