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

Still cleaning resources

Browse source
This commit is contained in:
Sylvain Berfini 2018-10-25 10:37:33 +02:00
parent 28d0308427
commit 6cd78120e3
16 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.6 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.7 KiB

0
res/drawable-xhdpi/pause_big_default.png → res/drawable-xhdpi/pause_default.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

0
res/drawable-xhdpi/pause_big_disabled.png → res/drawable-xhdpi/pause_disabled.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
res/drawable-xhdpi/pause_big_over_selected.png → res/drawable-xhdpi/pause_over_selected.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.4 KiB

8
res/drawable/pause.xml
View file

@ -1,8 +1,12 @@
<?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/pause_disabled" />
<item android:state_selected="true"
android:drawable="@drawable/pause_over_selected" />
<item android:state_pressed="true"
android:drawable="@drawable/pause_small_over_selected" />
android:drawable="@drawable/pause_over_selected" />
<item
android:drawable="@drawable/pause_small_default" />
android:drawable="@drawable/pause_default" />
</selector>

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

@ -127,7 +127,7 @@
<ImageView
android:id="@+id/pause"
android:src="@drawable/pause_big_default"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="80dp"
android:layout_height="80dp"

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

@ -135,7 +135,7 @@
<ImageView
android:id="@+id/pause"
android:src="@drawable/pause_big_default"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="80dp"
android:layout_height="80dp"

2
res/layout/call.xml
View file

@ -123,7 +123,7 @@
<ImageView
android:id="@+id/pause"
android:src="@drawable/pause_big_default"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="80dp"
android:layout_height="80dp"

3
res/layout/call_inactive_row.xml
View file

@ -4,7 +4,6 @@
android:alpha="0.5"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_margin="2dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="5dp">
@ -37,7 +36,7 @@
<ImageView
android:id="@+id/call_pause"
android:src="@drawable/pause_small_over_selected"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="40dp"
android:layout_height="40dp"

2
res/layout/conference_header.xml
View file

@ -38,7 +38,7 @@
android:adjustViewBounds="true"
android:layout_centerInParent="true"
android:padding="10dp"
android:src="@drawable/pause_big_default"/>
android:src="@drawable/pause"/>
<View
android:layout_width="match_parent"

2
res/layout/conference_paused_row.xml
View file

@ -29,7 +29,7 @@
<ImageView
android:id="@+id/conference_pause"
android:src="@drawable/pause_small_over_selected"
android:src="@drawable/pause"
android:contentDescription="@string/content_description_pause"
android:layout_width="40dp"
android:layout_height="40dp"

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

@ -728,10 +728,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
private void enabledPauseButton(boolean enabled) {
if (enabled) {
pause.setEnabled(true);
pause.setImageResource(R.drawable.pause_big_default);
} else {
pause.setEnabled(false);
pause.setImageResource(R.drawable.pause_big_disabled);
}
}
@ -918,14 +916,14 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
isVideoCallPaused = true;
}
pause.setImageResource(R.drawable.pause_big_over_selected);
pause.setSelected(true);
} else if (call != null) {
if (call.getState() == State.Paused) {
lc.resumeCall(call);
if (isVideoCallPaused) {
isVideoCallPaused = false;
}
pause.setImageResource(R.drawable.pause_big_default);
pause.setSelected(false);
}
}
}
@ -1496,10 +1494,10 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
conferenceStatus = findViewById(R.id.conference_pause);
if (conferenceStatus != null) {
if (lc.isInConference()) {
conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
conferenceStatus.setSelected(true);
lc.leaveConference();
} else {
conferenceStatus.setImageResource(R.drawable.pause_big_default);
conferenceStatus.setSelected(false);
lc.enterConference();
}
}

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

@ -200,7 +200,7 @@ public class DialerFragment extends Fragment {
mCall.resetClickListener();
}
mAddContact.setEnabled(true);
mAddContact.setImageResource(R.drawable.call_alt_back);
mAddContact.setImageResource(R.drawable.call_back);
mAddContact.setOnClickListener(cancelListener);
} else {
if (LinphoneManager.getLc().getVideoActivationPolicy().getAutomaticallyInitiate()) {