Skip to content
Snippets Groups Projects
Commit 1888bf3f authored by Alexandre Lision's avatar Alexandre Lision
Browse files

* #31377: open incall contextual actions by singleTapup instead of LongPress

parent 7955ae04
No related branches found
No related tags found
No related merge requests found
...@@ -40,17 +40,9 @@ as that of the covered work. ...@@ -40,17 +40,9 @@ as that of the covered work.
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<RelativeLayout <FrameLayout
android:id="@+id/ongoingcall_pane" android:id="@+id/ongoingcall_pane"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:layerType="hardware" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="No call Displayed" />
</RelativeLayout>
</org.sflphone.views.CallPaneLayout> </org.sflphone.views.CallPaneLayout>
\ No newline at end of file
...@@ -113,7 +113,7 @@ public class BubbleUser extends Bubble { ...@@ -113,7 +113,7 @@ public class BubbleUser extends Bubble {
mSelector = new Paint(); mSelector = new Paint();
mSelector.setStyle(Style.FILL); mSelector.setStyle(Style.FILL);
mSelector.setColor(mContext.getResources().getColor(R.color.sfl_light_blue)); mSelector.setColor(mContext.getResources().getColor(R.color.sfl_blue_9));
mButtonPaint = new Paint(); mButtonPaint = new Paint();
......
...@@ -332,6 +332,9 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -332,6 +332,9 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
int action = event.getActionMasked(); int action = event.getActionMasked();
if (gDetector.onTouchEvent(event))
return true;
if (action == MotionEvent.ACTION_UP) { if (action == MotionEvent.ACTION_UP) {
if (thread.suspendFlag) { if (thread.suspendFlag) {
Log.i(TAG, "Relaunch drawing thread"); Log.i(TAG, "Relaunch drawing thread");
...@@ -429,7 +432,7 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -429,7 +432,7 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
// thread.holdDrawing(); // thread.holdDrawing();
} }
return gDetector.onTouchEvent(event); return true;
} }
private Bubble getExpandedBubble() { private Bubble getExpandedBubble() {
...@@ -487,16 +490,13 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -487,16 +490,13 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
@Override @Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
// Log.d("Main", "onFling"); // Log.d("Main", "onFling");
return true; return false;
} }
@Override @Override
public void onLongPress(MotionEvent e) { public void onLongPress(MotionEvent e) {
// Log.d("Main", "onLongPress"); // Log.d("Main", "onLongPress");
if (isDraggingBubble() && callback.getConference().isOnGoing()) {
Bubble b = getDraggedBubble(e);
b.expand(model.width, model.height);
}
} }
private Bubble getDraggedBubble(MotionEvent e) { private Bubble getDraggedBubble(MotionEvent e) {
...@@ -528,7 +528,7 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -528,7 +528,7 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
b.speed.x = dx / dt; b.speed.x = dx / dt;
b.speed.y = dy / dt; b.speed.y = dy / dt;
return true; return false;
} }
} }
return true; return true;
...@@ -542,8 +542,13 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback, ...@@ -542,8 +542,13 @@ public class BubblesView extends SurfaceView implements SurfaceHolder.Callback,
@Override @Override
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
// Log.d("Main", "onSingleTapUp"); if (isDraggingBubble() && callback.getConference().isOnGoing()) {
return true; Bubble b = getDraggedBubble(e);
b.expand(model.width, model.height);
}
return false;
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment