mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conference button in call

Browse source
This commit is contained in:
Erwan Croze 2018-09-17 14:18:15 +02:00
parent b2c3c72ed7
commit d0383867ff
5 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/options_add_call_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
res/drawable-xhdpi/options_start_conference_over.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
res/drawable-xhdpi/options_transfer_call_over.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

4
res/layout/call.xml
View file

@ -477,8 +477,8 @@
android:layout_weight="0.5"
android:background="#aeaeae"
android:contentDescription="@string/content_description_conference"
android:padding="10dp"
android:src="@drawable/conference_default"
android:padding="5dp"
android:src="@drawable/options_start_conference_over"
android:visibility="invisible"/>
</LinearLayout>

2
src/android/org/linphone/call/CallActivity.java
View file

@ -789,8 +789,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void enabledConferenceButton(boolean enabled){
if (enabled) {
conference.setEnabled(true);
conference.setImageAlpha(255);
} else {
conference.setEnabled(false);
conference.setImageAlpha(102);
}
}