From fc2c9bcfedd17e7636df7abb2687426bc48661bf Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Tue, 31 Jul 2018 14:23:26 +0200
Subject: [PATCH] Fix pause view

---
 res/layout/call.xml                                    |  1 +
 res/layout/call_inactive_row.xml                       |  9 +++++----
 src/android/org/linphone/LinphoneService.java          |  2 +-
 src/android/org/linphone/call/CallActivity.java        |  6 +++---
 src/android/org/linphone/fragments/StatusFragment.java | 10 +++++-----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/res/layout/call.xml b/res/layout/call.xml
index 4d2d38aac..df2715afb 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -174,6 +174,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="match_parent"
 					android:layout_above="@id/calls_list"
+					android:alpha="0.85"
 					android:background="@color/colorN"
 					android:gravity="center_vertical"
 					android:orientation="vertical"
diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index 68886febf..3a5feb5f5 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -17,23 +17,24 @@
 
 	<TextView
 		android:id="@+id/contact_name"
-		style="@style/font14"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:gravity="center_vertical|left"
 		android:maxLines="1"
 		android:paddingLeft="20dp"
-		android:paddingRight="10dp"/>
+		android:paddingRight="10dp"
+		android:textColor="#aeaeae"/>
 
 	<Chronometer
 		android:id="@+id/call_timer"
-		style="@style/font16"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:gravity="center_vertical|right"
 		android:paddingLeft="10dp"
-		android:paddingRight="20dp"/>
+		android:paddingRight="20dp"
+		android:textColor="#ff5e00"
+		android:textSize="13.3sp"/>
 
 	<ImageView
 		android:id="@+id/call_pause"
diff --git a/src/android/org/linphone/LinphoneService.java b/src/android/org/linphone/LinphoneService.java
index 5d67d4ffd..002c7e78e 100644
--- a/src/android/org/linphone/LinphoneService.java
+++ b/src/android/org/linphone/LinphoneService.java
@@ -407,7 +407,7 @@ public final class LinphoneService extends Service {
 				}
 		});
 
-		if (displayServiceNotification() || (Version.sdkAboveOrEqual(Version.API26_O_80) && intent.getBooleanExtra("ForceStartForeground", false))) {
+		if (displayServiceNotification() || (Version.sdkAboveOrEqual(Version.API26_O_80) && intent != null && intent.getBooleanExtra("ForceStartForeground", false))) {
 			startForegroundCompat(NOTIF_ID, mNotif);
 		}
 
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 56a2291d3..6de77bb6a 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -767,7 +767,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			pause.setImageResource(R.drawable.pause_big_default);
 		} else {
 			pause.setEnabled(false);
-			pause.setImageResource(R.drawable.pause_big_disabled);
+			//pause.setImageResource(R.drawable.pause_big_disabled);
 		}
 	}
 
@@ -954,7 +954,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			if (isVideoEnabled(LinphoneManager.getLc().getCurrentCall())) {
 				isVideoCallPaused = true;
 			}
-			pause.setImageResource(R.drawable.pause_big_over_selected);
+			//pause.setImageResource(R.drawable.pause_big_over_selected);
 		} else if (call != null) {
 			if (call.getState() == State.Paused) {
 				lc.resumeCall(call);
@@ -1657,7 +1657,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 		conferenceStatus = (ImageView) findViewById(R.id.conference_pause);
 		if(conferenceStatus != null) {
 			if (lc.isInConference()) {
-				conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
+				//conferenceStatus.setImageResource(R.drawable.pause_big_over_selected);
 				lc.leaveConference();
 			} else {
 				conferenceStatus.setImageResource(R.drawable.pause_big_default);
diff --git a/src/android/org/linphone/fragments/StatusFragment.java b/src/android/org/linphone/fragments/StatusFragment.java
index 7f36d8afc..133b5206f 100644
--- a/src/android/org/linphone/fragments/StatusFragment.java
+++ b/src/android/org/linphone/fragments/StatusFragment.java
@@ -187,7 +187,7 @@ public class StatusFragment extends Fragment {
 
 			if(LinphoneManager.getLc().getProxyConfigList().length == 0){
 				statusLed.setImageResource(R.drawable.led_disconnected);
-				statusText.setText(getString(R.string.no_account));
+				//statusText.setText(getString(R.string.no_account));
 			}
 		}
 	}
@@ -195,7 +195,7 @@ public class StatusFragment extends Fragment {
 	public void resetAccountStatus(){
 		if(LinphoneManager.getLc().getProxyConfigList().length == 0){
 			statusLed.setImageResource(R.drawable.led_disconnected);
-			statusText.setText(getString(R.string.no_account));
+			//statusText.setText(getString(R.string.no_account));
 		}
 	}
 
@@ -307,14 +307,14 @@ public class StatusFragment extends Fragment {
 				// We are obviously connected
 				if(lc.getDefaultProxyConfig() == null){
 					statusLed.setImageResource(R.drawable.led_disconnected);
-					statusText.setText(getString(R.string.no_account));
+					//statusText.setText(getString(R.string.no_account));
 				} else {
 					statusLed.setImageResource(getStatusIconResource(lc.getDefaultProxyConfig().getState(),true));
-					statusText.setText(getStatusIconText(lc.getDefaultProxyConfig()));
+					//statusText.setText(getStatusIconText(lc.getDefaultProxyConfig()));
 				}
 			}
 		} else {
-			statusText.setVisibility(View.VISIBLE);
+			//statusText.setVisibility(View.VISIBLE);
 		}
 	}