diff --git a/res/drawable-xhdpi/backspace_disabled.png b/res/drawable-xhdpi/backspace_disabled.png new file mode 100644 index 000000000..9895301ce Binary files /dev/null and b/res/drawable-xhdpi/backspace_disabled.png differ diff --git a/res/drawable-xhdpi/camera_disabled.png b/res/drawable-xhdpi/camera_disabled.png new file mode 100644 index 000000000..0fa899521 Binary files /dev/null and b/res/drawable-xhdpi/camera_disabled.png differ diff --git a/res/drawable-xhdpi/contact_add_disabled.png b/res/drawable-xhdpi/contact_add_disabled.png new file mode 100644 index 000000000..2be5d9cc9 Binary files /dev/null and b/res/drawable-xhdpi/contact_add_disabled.png differ diff --git a/res/drawable-xhdpi/delete_disabled.png b/res/drawable-xhdpi/delete_disabled.png new file mode 100644 index 000000000..ce7025092 Binary files /dev/null and b/res/drawable-xhdpi/delete_disabled.png differ diff --git a/res/drawable-xhdpi/edit_list_disabled.png b/res/drawable-xhdpi/edit_list_disabled.png new file mode 100644 index 000000000..4817a6b0a Binary files /dev/null and b/res/drawable-xhdpi/edit_list_disabled.png differ diff --git a/res/drawable-xhdpi/menu_disabled.png b/res/drawable-xhdpi/menu_disabled.png new file mode 100644 index 000000000..e56d747f1 Binary files /dev/null and b/res/drawable-xhdpi/menu_disabled.png differ diff --git a/res/drawable-xhdpi/micro_disabled.png b/res/drawable-xhdpi/micro_disabled.png new file mode 100644 index 000000000..a2e952780 Binary files /dev/null and b/res/drawable-xhdpi/micro_disabled.png differ diff --git a/res/drawable-xhdpi/options_add_call_disabled.png b/res/drawable-xhdpi/options_add_call_disabled.png new file mode 100644 index 000000000..82a0e832e Binary files /dev/null and b/res/drawable-xhdpi/options_add_call_disabled.png differ diff --git a/res/drawable-xhdpi/options_disabled.png b/res/drawable-xhdpi/options_disabled.png new file mode 100644 index 000000000..533713d97 Binary files /dev/null and b/res/drawable-xhdpi/options_disabled.png differ diff --git a/res/drawable-xhdpi/options_start_conference_disabled.png b/res/drawable-xhdpi/options_start_conference_disabled.png new file mode 100644 index 000000000..468dc128d Binary files /dev/null and b/res/drawable-xhdpi/options_start_conference_disabled.png differ diff --git a/res/drawable-xhdpi/options_transfer_call_disabled.png b/res/drawable-xhdpi/options_transfer_call_disabled.png new file mode 100644 index 000000000..bbb11170b Binary files /dev/null and b/res/drawable-xhdpi/options_transfer_call_disabled.png differ diff --git a/res/drawable-xhdpi/speaker_disabled.png b/res/drawable-xhdpi/speaker_disabled.png new file mode 100644 index 000000000..aa2a0b78a Binary files /dev/null and b/res/drawable-xhdpi/speaker_disabled.png differ diff --git a/res/drawable-xhdpi/valid_disabled.png b/res/drawable-xhdpi/valid_disabled.png new file mode 100644 index 000000000..a7c040c4b Binary files /dev/null and b/res/drawable-xhdpi/valid_disabled.png differ diff --git a/res/drawable/backspace_disabled.xml b/res/drawable/backspace_disabled.xml deleted file mode 100644 index 9805546bd..000000000 --- a/res/drawable/backspace_disabled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/res/drawable/camera_button.xml b/res/drawable/camera_button.xml new file mode 100644 index 000000000..844fb67b3 --- /dev/null +++ b/res/drawable/camera_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/contact_add_disabled.xml b/res/drawable/contact_add_disabled.xml deleted file mode 100644 index 91d8435cc..000000000 --- a/res/drawable/contact_add_disabled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/res/drawable/delete_button.xml b/res/drawable/delete_button.xml new file mode 100644 index 000000000..e70740455 --- /dev/null +++ b/res/drawable/delete_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/edit_list_disabled.xml b/res/drawable/edit_list_disabled.xml deleted file mode 100644 index a665571c8..000000000 --- a/res/drawable/edit_list_disabled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/res/drawable/menu_disabled.xml b/res/drawable/menu_disabled.xml deleted file mode 100644 index 092f9b9b9..000000000 --- a/res/drawable/menu_disabled.xml +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/res/drawable/options_add_call_button.xml b/res/drawable/options_add_call_button.xml new file mode 100644 index 000000000..83a0120bc --- /dev/null +++ b/res/drawable/options_add_call_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/options_start_conference_button.xml b/res/drawable/options_start_conference_button.xml new file mode 100644 index 000000000..b04e79480 --- /dev/null +++ b/res/drawable/options_start_conference_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/options_transfer_call_button.xml b/res/drawable/options_transfer_call_button.xml new file mode 100644 index 000000000..4ba682b61 --- /dev/null +++ b/res/drawable/options_transfer_call_button.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/layout/call.xml b/res/layout/call.xml index a488fa404..c186d68b9 100644 --- a/res/layout/call.xml +++ b/res/layout/call.xml @@ -62,6 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="5dp" + android:gravity="center" android:layout_alignParentTop="true" android:layout_gravity="center"/> @@ -206,7 +207,7 @@ diff --git a/res/layout/chat.xml b/res/layout/chat.xml index 1864bc87b..46e5dba17 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -94,6 +94,7 @@ android:inputType="textMultiLine" android:maxLines="3" android:padding="5dp" + android:layout_margin="5dp" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml index a94064cf9..e9d0a2906 100644 --- a/res/layout/edit_list.xml +++ b/res/layout/edit_list.xml @@ -45,7 +45,7 @@ 1 && LinphoneManager.getLc().getCallsNb() > confsize) { - enabledConferenceButton(true); - } else { - enabledConferenceButton(false); - } - refreshInCallActions(); refreshCallList(getResources()); + enableAndRefreshInCallActions(); } private void refreshInCallActions() { @@ -527,13 +511,32 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve } private void enableAndRefreshInCallActions() { - addCall.setEnabled(LinphoneManager.getLc().getCallsNb() < LinphoneManager.getLc().getMaxCalls()); - transfer.setEnabled(getResources().getBoolean(R.bool.allow_transfers)); + int confsize = 0; + + if(LinphoneManager.getLc().isInConference()) { + confsize = LinphoneManager.getLc().getConferenceSize() - (LinphoneManager.getLc().isInConference() ? 1 : 0); + } + + //Enabled transfer button + if(isTransferAllowed && !LinphoneManager.getLc().soundResourcesLocked()) + enabledTransferButton(true); + + //Enable conference button + if(LinphoneManager.getLc().getCallsNb() > 1 && LinphoneManager.getLc().getCallsNb() > confsize && !LinphoneManager.getLc().soundResourcesLocked()) { + enabledConferenceButton(true); + } else { + enabledConferenceButton(false); + } + + addCall.setEnabled(LinphoneManager.getLc().getCallsNb() < LinphoneManager.getLc().getMaxCalls() && !LinphoneManager.getLc().soundResourcesLocked()); options.setEnabled(!getResources().getBoolean(R.bool.disable_options_in_call) && (addCall.isEnabled() || transfer.isEnabled())); - if(LinphoneManager.getLc().getCurrentCall() != null && LinphonePreferences.instance().isVideoEnabled() && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()) { + if(LinphoneManager.getLc().getCurrentCall() != null && LinphonePreferences.instance().isVideoEnabled() && !LinphoneManager.getLc().soundResourcesLocked()) { enabledVideoButton(true); } + if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().soundResourcesLocked()){ + enabledPauseButton(true); + } micro.setEnabled(true); if(!isTablet()){ speaker.setEnabled(true); @@ -541,7 +544,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve transfer.setEnabled(true); pause.setEnabled(true); dialer.setEnabled(true); - enabledConferenceButton(true); } public void updateStatusFragment(StatusFragment statusFragment) { @@ -636,10 +638,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve private void enabledVideoButton(boolean enabled){ if(enabled) { video.setEnabled(true); - video.setAlpha(1f); } else { video.setEnabled(false); - video.setAlpha(0.2f); } } @@ -656,20 +656,16 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve private void enabledTransferButton(boolean enabled){ if(enabled) { transfer.setEnabled(true); - transfer.setImageAlpha(250); } else { transfer.setEnabled(false); - transfer.setImageAlpha(50); } } private void enabledConferenceButton(boolean enabled){ if (enabled) { conference.setEnabled(true); - conference.setImageAlpha(250); } else { conference.setEnabled(false); - conference.setImageAlpha(50); } } @@ -1357,10 +1353,6 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve mSensorManager.registerListener(this, mProximity, SensorManager.SENSOR_DELAY_NORMAL); removeCallbacks(); } - - if(LinphoneManager.getLc().getCurrentCall() != null && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()){ - enabledPauseButton(true); - } } private void handleViewIntent() { diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index bdfed8b87..fac09577d 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -325,11 +325,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC public void enabledDeleteButton(Boolean enabled){ if(enabled){ delete.setEnabled(true); - delete.setAlpha(1f); } else { if (getNbItemsChecked() == 0){ delete.setEnabled(false); - delete.setAlpha(0.2f); } } } diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index 59637d30c..a91efc074 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -158,11 +158,9 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte public void enabledDeleteButton(Boolean enabled){ if(enabled){ delete.setEnabled(true); - delete.setAlpha(1f); } else { if (getNbItemsChecked() == 0){ delete.setEnabled(false); - delete.setAlpha(0.2f); } } } diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java index 9681e177e..4535bbd58 100644 --- a/src/org/linphone/ContactsListFragment.java +++ b/src/org/linphone/ContactsListFragment.java @@ -178,11 +178,9 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O public void enabledDeleteButton(Boolean enabled){ if(enabled){ delete.setEnabled(true); - delete.setAlpha(1f); } else { if (getNbItemsChecked() == 0){ delete.setEnabled(false); - delete.setAlpha(0.2f); } } } diff --git a/src/org/linphone/HistoryListFragment.java b/src/org/linphone/HistoryListFragment.java index c0adbb69a..842e2a66b 100644 --- a/src/org/linphone/HistoryListFragment.java +++ b/src/org/linphone/HistoryListFragment.java @@ -156,11 +156,9 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On public void enabledDeleteButton(Boolean enabled){ if(enabled){ delete.setEnabled(true); - delete.setAlpha(1f); } else { if (getNbItemsChecked() == 0){ delete.setEnabled(false); - delete.setAlpha(0.2f); } } }