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

Still improving resources

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-25 11:09:58 +02:00
parent 6cd78120e3
commit 47e7bc2293
51 changed files with 117 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
res/drawable-xhdpi/chat_group_informations.png → res/drawable-xhdpi/chat_group_informations_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
res/drawable-xhdpi/contact_add.png → res/drawable-xhdpi/contact_add_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

0
res/drawable-xhdpi/delete.png → res/drawable-xhdpi/delete_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
res/drawable-xhdpi/edit_list.png → res/drawable-xhdpi/edit_list_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
res/drawable-xhdpi/menu.png → res/drawable-xhdpi/menu_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 397 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 503 B

After

Width:  |  Height:  |  Size: 468 B

0
res/drawable-xhdpi/options_add_call.png → res/drawable-xhdpi/options_add_call_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
res/drawable-xhdpi/options_start_conference.png → res/drawable-xhdpi/options_start_conference_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

0
res/drawable-xhdpi/options_transfer_call.png → res/drawable-xhdpi/options_transfer_call_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
res/drawable-xhdpi/resizable_assistant_button.9.png → res/drawable-xhdpi/resizable_assistant_button_default.9.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 538 B

0
res/drawable-xhdpi/route_bluetooth.png → res/drawable-xhdpi/route_bluetooth_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
res/drawable-xhdpi/route_earpiece.png → res/drawable-xhdpi/route_earpiece_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

0
res/drawable-xhdpi/route_speaker.png → res/drawable-xhdpi/route_speaker_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
res/drawable-xhdpi/valid.png → res/drawable-xhdpi/valid_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

2
res/drawable/assistant_button.xml
View file

@ -5,6 +5,6 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/resizable_assistant_button_disabled" /> android:drawable="@drawable/resizable_assistant_button_disabled" />
<item <item
android:drawable="@drawable/resizable_assistant_button" /> android:drawable="@drawable/resizable_assistant_button_default" />
</selector> </selector>

0
res/drawable/camera_button.xml → res/drawable/camera.xml
View file

7
res/drawable/chat_group_informations.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/chat_group_informations_disabled" />
<item
android:drawable="@drawable/chat_group_informations_default" />
</selector>

2
res/drawable/chat_room_creation_confirm.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" <item android:state_enabled="true"
android:drawable="@drawable/valid" /> android:drawable="@drawable/valid_default" />
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/valid_disabled" /> android:drawable="@drawable/valid_disabled" />
</selector> </selector>

2
res/drawable/contact_add_button.xml → res/drawable/contact_add.xml
View file

@ -3,6 +3,6 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/contact_add_disabled" /> android:drawable="@drawable/contact_add_disabled" />
<item <item
android:drawable="@drawable/contact_add" /> android:drawable="@drawable/contact_add_default" />
</selector> </selector>

2
res/drawable/delete_button.xml → res/drawable/delete.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/delete_disabled" /> android:drawable="@drawable/delete_disabled" />
<item <item
android:drawable="@drawable/delete" /> android:drawable="@drawable/delete_default" />
</selector> </selector>

2
res/drawable/edit_list_button.xml → res/drawable/edit_list.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/edit_list_disabled" /> android:drawable="@drawable/edit_list_disabled" />
<item <item
android:drawable="@drawable/edit_list" /> android:drawable="@drawable/edit_list_default" />
</selector> </selector>

2
res/drawable/menu_burger.xml → res/drawable/menu.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/menu_disabled" /> android:drawable="@drawable/menu_disabled" />
<item <item
android:drawable="@drawable/menu" /> android:drawable="@drawable/menu_default" />
</selector> </selector>

2
res/drawable/micro.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" <item android:state_selected="true"
android:drawable="@drawable/micro_selected" /> android:drawable="@drawable/micro_selected" />
<item <item
android:drawable="@drawable/micro_default" /> android:drawable="@drawable/micro_default" />

7
res/drawable/options.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/options_selected" />
<item
android:drawable="@drawable/options_default" />
</selector>

2
res/drawable/options_add_call_button.xml → res/drawable/options_add_call.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/options_add_call_disabled" /> android:drawable="@drawable/options_add_call_disabled" />
<item <item
android:drawable="@drawable/options_add_call" /> android:drawable="@drawable/options_add_call_default" />
</selector> </selector>

2
res/drawable/options_start_conference_button.xml → res/drawable/options_start_conference.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/options_start_conference_disabled" /> android:drawable="@drawable/options_start_conference_disabled" />
<item <item
android:drawable="@drawable/options_start_conference" /> android:drawable="@drawable/options_start_conference_default" />
</selector> </selector>

2
res/drawable/options_transfer_call_button.xml → res/drawable/options_transfer_call.xml
View file

@ -3,5 +3,5 @@
<item android:state_enabled="false" <item android:state_enabled="false"
android:drawable="@drawable/options_transfer_call_disabled" /> android:drawable="@drawable/options_transfer_call_disabled" />
<item <item
android:drawable="@drawable/options_transfer_call" /> android:drawable="@drawable/options_transfer_call_default" />
</selector> </selector>

9
res/drawable/resizable_assistant_button.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/resizable_assistant_button_disabled" />
<item android:state_pressed="true"
android:drawable="@drawable/resizable_assistant_button_over" />
<item
android:drawable="@drawable/resizable_assistant_button_default" />
</selector>

7
res/drawable/route_bluetooth.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_bluetooth_selected" />
<item
android:drawable="@drawable/route_bluetooth_default" />
</selector>

7
res/drawable/route_earpiece.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_earpiece_selected" />
<item
android:drawable="@drawable/route_earpiece_default" />
</selector>

7
res/drawable/route_speaker.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@drawable/route_speaker_selected" />
<item
android:drawable="@drawable/route_speaker_default" />
</selector>

2
res/drawable/speaker.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true" <item android:state_selected="true"
android:drawable="@drawable/speaker_selected" /> android:drawable="@drawable/speaker_selected" />
<item <item
android:drawable="@drawable/speaker_default" /> android:drawable="@drawable/speaker_default" />

7
res/drawable/valid.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
android:drawable="@drawable/valid_disabled" />
<item
android:drawable="@drawable/valid_default" />
</selector>

4
res/layout-land/call_outgoing.xml
View file

@ -116,7 +116,7 @@
<ImageView <ImageView
android:id="@+id/micro" android:id="@+id/micro"
android:src="@drawable/micro_default" android:src="@drawable/micro"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -126,7 +126,7 @@
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout-land/dialer.xml
View file

@ -82,7 +82,7 @@
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add_button" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent" android:layout_width="match_parent"

4
res/layout-sw533dp-land/call_outgoing.xml
View file

@ -116,7 +116,7 @@
<ImageView <ImageView
android:id="@+id/micro" android:id="@+id/micro"
android:src="@drawable/micro_default" android:src="@drawable/micro"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -126,7 +126,7 @@
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout-sw533dp-land/dialer.xml
View file

@ -79,7 +79,7 @@
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add_button" android:src="@drawable/contact_add"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout-sw533dp/dialer.xml
View file

@ -79,7 +79,7 @@
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add_button" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout/assistant_country_list.xml
View file

@ -40,7 +40,7 @@
android:id="@+id/clearSearchField" android:id="@+id/clearSearchField"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:src="@drawable/clean_field_default" android:src="@drawable/clean_field"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:paddingLeft="5dp" android:paddingLeft="5dp"

14
res/layout/call.xml
View file

@ -199,7 +199,7 @@
<ImageView <ImageView
android:id="@+id/video" android:id="@+id/video"
android:src="@drawable/camera_button" android:src="@drawable/camera"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_switch_video" android:contentDescription="@string/content_description_switch_video"
android:padding="20dp" android:padding="20dp"
@ -219,7 +219,7 @@
<ImageView <ImageView
android:id="@+id/micro" android:id="@+id/micro"
android:src="@drawable/micro_default" android:src="@drawable/micro"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:padding="10dp" android:padding="10dp"
@ -229,7 +229,7 @@
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:padding="15dp" android:padding="15dp"
@ -250,7 +250,7 @@
<ImageView <ImageView
android:id="@+id/options" android:id="@+id/options"
android:src="@drawable/options_default" android:src="@drawable/options"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_call_options" android:contentDescription="@string/content_description_call_options"
android:padding="15dp" android:padding="15dp"
@ -350,7 +350,7 @@
<ImageView <ImageView
android:id="@+id/add_call" android:id="@+id/add_call"
android:src="@drawable/options_add_call_button" android:src="@drawable/options_add_call"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_add_call" android:contentDescription="@string/content_description_add_call"
android:padding="15dp" android:padding="15dp"
@ -393,7 +393,7 @@
<ImageView <ImageView
android:id="@+id/transfer" android:id="@+id/transfer"
android:src="@drawable/options_transfer_call_button" android:src="@drawable/options_transfer_call"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_transfer" android:contentDescription="@string/content_description_transfer"
android:padding="15dp" android:padding="15dp"
@ -435,7 +435,7 @@
<ImageView <ImageView
android:id="@+id/conference" android:id="@+id/conference"
android:src="@drawable/options_start_conference_button" android:src="@drawable/options_start_conference"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_conference" android:contentDescription="@string/content_description_conference"
android:visibility="invisible" android:visibility="invisible"

4
res/layout/call_outgoing.xml
View file

@ -102,7 +102,7 @@
<ImageView <ImageView
android:id="@+id/micro" android:id="@+id/micro"
android:src="@drawable/micro_default" android:src="@drawable/micro"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_micro" android:contentDescription="@string/content_description_toggle_micro"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -112,7 +112,7 @@
<ImageView <ImageView
android:id="@+id/speaker" android:id="@+id/speaker"
android:src="@drawable/speaker_default" android:src="@drawable/speaker"
android:background="@drawable/button_background" android:background="@drawable/button_background"
android:contentDescription="@string/content_description_toggle_speaker" android:contentDescription="@string/content_description_toggle_speaker"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout/chat.xml
View file

@ -86,7 +86,7 @@
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list" android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/chatlist.xml
View file

@ -54,7 +54,7 @@
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list" android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/contacts_list.xml
View file

@ -76,7 +76,7 @@
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list" android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/context_bar.xml
View file

@ -123,7 +123,7 @@
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list" android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/dialer.xml
View file

@ -76,7 +76,7 @@
<ImageView <ImageView
android:id="@+id/add_contact" android:id="@+id/add_contact"
android:src="@drawable/contact_add_button" android:src="@drawable/contact_add"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_add_contact" android:contentDescription="@string/content_description_add_contact"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/layout/edit_list.xml
View file

@ -45,7 +45,7 @@
<ImageView <ImageView
android:id="@+id/delete" android:id="@+id/delete"
android:src="@drawable/delete_button" android:src="@drawable/delete"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_delete_selection" android:contentDescription="@string/content_description_delete_selection"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/history.xml
View file

@ -65,7 +65,7 @@
<ImageView <ImageView
android:id="@+id/edit" android:id="@+id/edit"
android:src="@drawable/edit_list_button" android:src="@drawable/edit_list"
android:background="@drawable/toolbar_button" android:background="@drawable/toolbar_button"
android:contentDescription="@string/content_description_edit_list" android:contentDescription="@string/content_description_edit_list"
android:layout_width="0dp" android:layout_width="0dp"

2
res/layout/status.xml
View file

@ -13,7 +13,7 @@
<ImageView <ImageView
android:id="@+id/side_menu_button" android:id="@+id/side_menu_button"
android:src="@drawable/menu_burger" android:src="@drawable/menu"
android:contentDescription="@string/content_description_menu" android:contentDescription="@string/content_description_menu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

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

@ -541,50 +541,42 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} else { } else {
if (video.isEnabled()) { if (video.isEnabled()) {
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) { if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
video.setImageResource(R.drawable.camera_selected); video.setSelected(true);
videoProgress.setVisibility(View.INVISIBLE); videoProgress.setVisibility(View.INVISIBLE);
} else { } else {
video.setImageResource(R.drawable.camera_button); video.setSelected(false);
} }
} else { } else {
video.setImageResource(R.drawable.camera_button); video.setSelected(false);
} }
} }
if (getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName()) != PackageManager.PERMISSION_GRANTED) { if (getPackageManager().checkPermission(Manifest.permission.CAMERA, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
video.setImageResource(R.drawable.camera_button); video.setSelected(false);
} }
if (isSpeakerEnabled) { speaker.setSelected(isSpeakerEnabled);
speaker.setImageResource(R.drawable.speaker_selected);
} else {
speaker.setImageResource(R.drawable.speaker_default);
}
if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) != PackageManager.PERMISSION_GRANTED) { if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) != PackageManager.PERMISSION_GRANTED) {
isMicMuted = true; isMicMuted = true;
} }
if (isMicMuted) { micro.setSelected(isMicMuted);
micro.setImageResource(R.drawable.micro_selected);
} else {
micro.setImageResource(R.drawable.micro_default);
}
try { try {
routeSpeaker.setImageResource(R.drawable.route_speaker); routeSpeaker.setSelected(false);
if (BluetoothManager.getInstance().isUsingBluetoothAudioRoute()) { if (BluetoothManager.getInstance().isUsingBluetoothAudioRoute()) {
isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly
routeEarpiece.setImageResource(R.drawable.route_earpiece); routeEarpiece.setSelected(false);
routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected); routeBluetooth.setSelected(true);
return; return;
} else { } else {
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected); routeEarpiece.setSelected(true);
routeBluetooth.setImageResource(R.drawable.route_bluetooth); routeBluetooth.setSelected(false);
} }
if (isSpeakerEnabled) { if (isSpeakerEnabled) {
routeSpeaker.setImageResource(R.drawable.route_speaker_selected); routeSpeaker.setSelected(true);
routeEarpiece.setImageResource(R.drawable.route_earpiece); routeEarpiece.setSelected(false);
routeBluetooth.setImageResource(R.drawable.route_bluetooth); routeBluetooth.setSelected(false);
} }
} catch (NullPointerException npe) { } catch (NullPointerException npe) {
Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)"); Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)");
@ -690,24 +682,24 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} else if (id == R.id.route_bluetooth) { } else if (id == R.id.route_bluetooth) {
if (BluetoothManager.getInstance().routeAudioToBluetooth()) { if (BluetoothManager.getInstance().routeAudioToBluetooth()) {
isSpeakerEnabled = false; isSpeakerEnabled = false;
routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected); routeBluetooth.setSelected(true);
routeSpeaker.setImageResource(R.drawable.route_speaker); routeSpeaker.setSelected(false);
routeEarpiece.setImageResource(R.drawable.route_earpiece); routeEarpiece.setSelected(false);
} }
hideOrDisplayAudioRoutes(); hideOrDisplayAudioRoutes();
} else if (id == R.id.route_earpiece) { } else if (id == R.id.route_earpiece) {
LinphoneManager.getInstance().routeAudioToReceiver(); LinphoneManager.getInstance().routeAudioToReceiver();
isSpeakerEnabled = false; isSpeakerEnabled = false;
routeBluetooth.setImageResource(R.drawable.route_bluetooth); routeBluetooth.setSelected(false);
routeSpeaker.setImageResource(R.drawable.route_speaker); routeSpeaker.setSelected(false);
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected); routeEarpiece.setSelected(true);
hideOrDisplayAudioRoutes(); hideOrDisplayAudioRoutes();
} else if (id == R.id.route_speaker) { } else if (id == R.id.route_speaker) {
LinphoneManager.getInstance().routeAudioToSpeaker(); LinphoneManager.getInstance().routeAudioToSpeaker();
isSpeakerEnabled = true; isSpeakerEnabled = true;
routeBluetooth.setImageResource(R.drawable.route_bluetooth); routeBluetooth.setSelected(false);
routeSpeaker.setImageResource(R.drawable.route_speaker_selected); routeSpeaker.setSelected(true);
routeEarpiece.setImageResource(R.drawable.route_earpiece); routeEarpiece.setSelected(false);
hideOrDisplayAudioRoutes(); hideOrDisplayAudioRoutes();
} else if (id == R.id.call_pause) { } else if (id == R.id.call_pause) {
Call call = (Call) v.getTag(); Call call = (Call) v.getTag();
@ -883,11 +875,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
Core lc = LinphoneManager.getLc(); Core lc = LinphoneManager.getLc();
isMicMuted = !isMicMuted; isMicMuted = !isMicMuted;
lc.enableMic(!isMicMuted); lc.enableMic(!isMicMuted);
if (isMicMuted) { micro.setSelected(isMicMuted);
micro.setImageResource(R.drawable.micro_selected);
} else {
micro.setImageResource(R.drawable.micro_default);
}
} }
protected void toggleSpeaker() { protected void toggleSpeaker() {
@ -898,14 +886,13 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
else else
LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled); LinphoneManager.getInstance().enableProximitySensing(!isSpeakerEnabled);
} }
speaker.setSelected(isSpeakerEnabled);
if (isSpeakerEnabled) { if (isSpeakerEnabled) {
LinphoneManager.getInstance().routeAudioToSpeaker(); LinphoneManager.getInstance().routeAudioToSpeaker();
speaker.setImageResource(R.drawable.speaker_selected);
LinphoneManager.getInstance().enableSpeaker(isSpeakerEnabled); LinphoneManager.getInstance().enableSpeaker(isSpeakerEnabled);
} else { } else {
Log.d("Toggle speaker off, routing back to earpiece"); Log.d("Toggle speaker off, routing back to earpiece");
LinphoneManager.getInstance().routeAudioToReceiver(); LinphoneManager.getInstance().routeAudioToReceiver();
speaker.setImageResource(R.drawable.speaker_default);
} }
} }
@ -987,7 +974,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
conference.setVisibility(View.INVISIBLE); conference.setVisibility(View.INVISIBLE);
displayVideoCall(false); displayVideoCall(false);
numpad.setVisibility(View.GONE); numpad.setVisibility(View.GONE);
options.setImageResource(R.drawable.options_default); options.setSelected(false);
} }
}, SECONDS_BEFORE_HIDING_CONTROLS); }, SECONDS_BEFORE_HIDING_CONTROLS);
} }
@ -1037,7 +1024,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void hideOrDisplayCallOptions() { private void hideOrDisplayCallOptions() {
//Hide options //Hide options
if (addCall.getVisibility() == View.VISIBLE) { if (addCall.getVisibility() == View.VISIBLE) {
options.setImageResource(R.drawable.options_default); options.setSelected(false);
if (isTransferAllowed) { if (isTransferAllowed) {
transfer.setVisibility(View.INVISIBLE); transfer.setVisibility(View.INVISIBLE);
} }
@ -1049,7 +1036,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
} }
addCall.setVisibility(View.VISIBLE); addCall.setVisibility(View.VISIBLE);
conference.setVisibility(View.VISIBLE); conference.setVisibility(View.VISIBLE);
options.setImageResource(R.drawable.options_selected); options.setSelected(true);
transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null); transfer.setEnabled(LinphoneManager.getLc().getCurrentCall() != null);
} }
} }
@ -1363,7 +1350,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
onCallStateChanged.setOnClickListener(this); onCallStateChanged.setOnClickListener(this);
if (call.getState() == State.Paused || call.getState() == State.PausedByRemote || call.getState() == State.Pausing) { if (call.getState() == State.Paused || call.getState() == State.PausedByRemote || call.getState() == State.Pausing) {
onCallStateChanged.setImageResource(R.drawable.pause); onCallStateChanged.setSelected(false);
isCallPaused = true; isCallPaused = true;
isInConference = false; isInConference = false;
} else if (call.getState() == State.OutgoingInit || call.getState() == State.OutgoingProgress || call.getState() == State.OutgoingRinging) { } else if (call.getState() == State.OutgoingInit || call.getState() == State.OutgoingProgress || call.getState() == State.OutgoingRinging) {

2
src/android/org/linphone/fragments/DialerFragment.java
View file

@ -209,7 +209,7 @@ public class DialerFragment extends Fragment {
mCall.setImageResource(R.drawable.call_audio_start); mCall.setImageResource(R.drawable.call_audio_start);
} }
mAddContact.setEnabled(false); mAddContact.setEnabled(false);
mAddContact.setImageResource(R.drawable.contact_add_button); mAddContact.setImageResource(R.drawable.contact_add);
mAddContact.setOnClickListener(addContactListener); mAddContact.setOnClickListener(addContactListener);
enableDisableAddContact(); enableDisableAddContact();
} }