From f597d8122570f67f85348f757038e93e49358b07 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 27 Aug 2012 12:32:57 +0200 Subject: [PATCH] Some improvements for tablets --- res/drawable-xlarge-land-hdpi/mark.png | Bin 601 -> 596 bytes res/layout-xlarge-land/dialer.xml | 3 + res/layout-xlarge-land/main.xml | 58 ++++++++- res/layout-xlarge-land/settings.xml | 160 +++++++++++++++++++++++++ src/org/linphone/DialerFragment.java | 7 +- src/org/linphone/LinphoneActivity.java | 4 +- src/org/linphone/LinphoneService.java | 1 + 7 files changed, 228 insertions(+), 5 deletions(-) create mode 100644 res/layout-xlarge-land/settings.xml diff --git a/res/drawable-xlarge-land-hdpi/mark.png b/res/drawable-xlarge-land-hdpi/mark.png index a2c57acc1a69ce65c93d18b42fd16e5fc886db05..032e5fb0a2f8703b7de4cf63e1ec5020108a9268 100644 GIT binary patch delta 163 zcmcb~a)o7rI9DSF8v_G_1b61WiHi0d(wu6F^VD49CT3`8toL+r45_&F_NpNx0|Uq5 z4UP5Z3z8eOCtg@SHHC>`PZlS`fd)n(nz&JtnIfuFydjxU>M9fCmMbqhfsSGDboFyt I=akR{03SO#K>z>% delta 132 zcmcb@a+76(I9D?V8v_GF=;0GrCo0-=aBvHVy;~n^JuyQ=af_#mV@SoVw^t1r85lSY zZ)mJP|DdVe#c6)nBu<8cRjLe=FEHj#KFe4D#P$>SvrQIa62nD_$wkG?XJTc&a^xA% OHU>{uKbLh*2~7Yu6D{Ka diff --git a/res/layout-xlarge-land/dialer.xml b/res/layout-xlarge-land/dialer.xml index fc24bd40c..5c04c2913 100644 --- a/res/layout-xlarge-land/dialer.xml +++ b/res/layout-xlarge-land/dialer.xml @@ -8,7 +8,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentTop="true" + android:focusable="true" + android:focusableInTouchMode="true" android:layout_gravity="center"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout-xlarge-land/settings.xml b/res/layout-xlarge-land/settings.xml new file mode 100644 index 000000000..75e6e7575 --- /dev/null +++ b/res/layout-xlarge-land/settings.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index 80a8c8650..abdb1f066 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -51,12 +51,12 @@ public class DialerFragment extends Fragment { Bundle savedInstanceState) { instance = this; View view = inflater.inflate(R.layout.dialer, container, false); - + mAddress = (AddressText) view.findViewById(R.id.Adress); mAddress.setDialerFragment(this); + EraseButton erase = (EraseButton) view.findViewById(R.id.Erase); erase.setAddressWidget(mAddress); - erase.requestFocus(); mCall = (CallButton) view.findViewById(R.id.Call); mCall.setAddressWidget(mAddress); @@ -71,8 +71,9 @@ public class DialerFragment extends Fragment { } AddressAware numpad = (AddressAware) view.findViewById(R.id.Dialer); - if (numpad != null) + if (numpad != null) { numpad.setAddressWidget(mAddress); + } mAddContact = (ImageView) view.findViewById(R.id.addContact); diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 7d8b33d1b..c14bfc30f 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -124,7 +124,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene } setContentView(R.layout.main); - instance = this; + instance = this; initButtons(); currentFragment = FragmentsAvailable.DIALER; @@ -171,6 +171,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene changeCurrentFragment(newFragmentType, extras, false); } + @SuppressWarnings("incomplete-switch") private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras, boolean withoutAnimation) { if (newFragmentType == currentFragment && newFragmentType != FragmentsAvailable.CHAT) { return; @@ -438,6 +439,7 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene chat.setSelected(false); } + @SuppressWarnings("incomplete-switch") public void selectMenu(FragmentsAvailable menuToSelect) { currentFragment = menuToSelect; resetSelection(); diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 549ee7685..15d71cd6e 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -603,6 +603,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis } else { FileInputStream fis = new FileInputStream(uriString); mRingerPlayer.setDataSource(fis.getFD()); + fis.close(); } } catch (IOException e) { Log.e(e, "Cannot set ringtone");