diff --git a/res/drawable-xhdpi/arrow_accept.png b/res/drawable-xhdpi/arrow_accept.png
index 97958ebb4..63db1a498 100644
Binary files a/res/drawable-xhdpi/arrow_accept.png and b/res/drawable-xhdpi/arrow_accept.png differ
diff --git a/res/drawable-xhdpi/arrow_hangup.png b/res/drawable-xhdpi/arrow_hangup.png
index 8c113903c..1fc53d1b9 100644
Binary files a/res/drawable-xhdpi/arrow_hangup.png and b/res/drawable-xhdpi/arrow_hangup.png differ
diff --git a/res/drawable/pause.xml b/res/drawable/pause.xml
index db65212ca..08dfa7626 100644
--- a/res/drawable/pause.xml
+++ b/res/drawable/pause.xml
@@ -1,8 +1,6 @@
-
-
+
+
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 45924e332..5b537d9b2 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -473,13 +473,16 @@
+ android:layout_gravity="left"
+ android:layout_marginTop="30dp"
+ android:background="@color/colorH">
-
+
diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index e1cb2818a..68886febf 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -1,46 +1,46 @@
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_margin="2dp"
+ android:alpha="0.5"
+ android:background="@color/colorM"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:padding="5dp">
+ android:layout_height="40dp"
+ android:src="@drawable/avatar_big_secure1"/>
-
+ android:paddingLeft="20dp"
+ android:paddingRight="10dp"/>
+ android:paddingRight="20dp"/>
-
+ android:gravity="center_vertical"
+ android:src="@drawable/pause"/>
\ No newline at end of file
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index 00e5cc6a4..afa89d476 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -121,22 +121,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:background="@color/colorA"
+ android:background="@color/colorN"
android:orientation="horizontal"
- android:paddingBottom="15dp"
- android:paddingLeft="15dp"
- android:paddingTop="15dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="10dp"
+ android:paddingTop="10dp"
android:visibility="gone">
@@ -163,9 +168,9 @@
android:layout_gravity="bottom"
android:background="@color/colorB"
android:orientation="horizontal"
- android:paddingBottom="15dp"
- android:paddingLeft="15dp"
- android:paddingTop="15dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="10dp"
+ android:paddingTop="10dp"
android:visibility="gone">
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index 921e69f71..db8ff67c2 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -573,14 +573,14 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
isSpeakerEnabled = false; // We need this if isSpeakerEnabled wasn't set correctly
//routeEarpiece.setImageResource(R.drawable.route_earpiece);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
- routeEarpiece.setAlpha(0.5f);
- routeBluetooth.setAlpha(1f);
+ routeEarpiece.setImageAlpha(120);
+ routeBluetooth.setImageAlpha(255);
return;
} else {
//routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth);
- routeEarpiece.setAlpha(1f);
- routeBluetooth.setAlpha(0.5f);
+ routeEarpiece.setImageAlpha(255);
+ routeBluetooth.setImageAlpha(120);
}
if (isSpeakerEnabled) {
@@ -588,8 +588,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
//routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
//routeEarpiece.setImageResource(R.drawable.route_earpiece);
//routeBluetooth.setImageResource(R.drawable.route_bluetooth);
- routeEarpiece.setAlpha(0.5f);
- routeBluetooth.setAlpha(0.5f);
+ routeEarpiece.setImageAlpha(120);
+ routeBluetooth.setImageAlpha(120);
}
} catch (NullPointerException npe) {
Log.e("Bluetooth: Audio routes menu disabled on tablets for now (4)");
@@ -711,8 +711,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth_selected);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece);*/
- routeEarpiece.setAlpha(0.5f);
- routeBluetooth.setAlpha(1f);
+ routeEarpiece.setImageAlpha(120);
+ routeBluetooth.setImageAlpha(255);
routeSpeaker.setImageResource(R.drawable.speaker_default);
}
hideOrDisplayAudioRoutes();
@@ -723,8 +723,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker);
routeEarpiece.setImageResource(R.drawable.route_earpiece_selected);*/
- routeEarpiece.setAlpha(1f);
- routeBluetooth.setAlpha(0.5f);
+ routeEarpiece.setImageAlpha(255);
+ routeBluetooth.setImageAlpha(120);
routeSpeaker.setImageResource(R.drawable.speaker_default);
hideOrDisplayAudioRoutes();
}
@@ -734,8 +734,8 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
/*routeBluetooth.setImageResource(R.drawable.route_bluetooth);
routeSpeaker.setImageResource(R.drawable.route_speaker_selected);
routeEarpiece.setImageResource(R.drawable.route_earpiece);*/
- routeEarpiece.setAlpha(0.5f);
- routeBluetooth.setAlpha(0.5f);
+ routeEarpiece.setImageAlpha(120);
+ routeBluetooth.setImageAlpha(120);
routeSpeaker.setImageResource(R.drawable.route_speaker_default);
hideOrDisplayAudioRoutes();
}
diff --git a/src/android/org/linphone/call/CallIncomingActivity.java b/src/android/org/linphone/call/CallIncomingActivity.java
index 593750c3b..8dcfbe18f 100644
--- a/src/android/org/linphone/call/CallIncomingActivity.java
+++ b/src/android/org/linphone/call/CallIncomingActivity.java
@@ -138,7 +138,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin
answerX = curX;
if (oldMove < -25)
begin = false;
- if (curX < arrow.getWidth() && !begin) {
+ if (curX < acceptUnlock.getWidth()*1.5f && !begin) {
answer();
return true;
}
@@ -167,7 +167,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity implements Lin
curX = motionEvent.getX();
view.scrollBy((int) (declineX - curX), view.getScrollY());
declineX = curX;
- if (curX > (screenWidth-arrow.getWidth()*4)) {
+ if (curX > (screenWidth-arrow.getWidth()*6)) {
decline();
return true;
}