From 22f40d1a14352972b015451a5ca0c83ab4f786bd Mon Sep 17 00:00:00 2001
From: Aline Bonnet <aline.bonnet@savoirfairelinux.com>
Date: Fri, 27 Jan 2017 17:16:48 -0500
Subject: [PATCH] ui: move the buttons in the notifications
When incoming call, the hangup button is to the right of the accept
button in the notification. In the callfragment, it's the opposite.
This commit changes order of this buttons in the notification to be
consistent.
Change-Id: I11faec0e6796ecf553923cbb70936827c60976d9
Tuleap: #1450
---
.../app/src/main/java/cx/ring/utils/ActionHelper.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/utils/ActionHelper.java b/ring-android/app/src/main/java/cx/ring/utils/ActionHelper.java
index 907fb9716..204d213f5 100644
--- a/ring-android/app/src/main/java/cx/ring/utils/ActionHelper.java
+++ b/ring-android/app/src/main/java/cx/ring/utils/ActionHelper.java
@@ -240,19 +240,19 @@ public class ActionHelper {
.setContentText(ctx.getText(R.string.notif_incoming_call))
.setContentIntent(gotoIntent)
.setFullScreenIntent(gotoIntent, true)
- .addAction(R.drawable.ic_action_accept, ctx.getText(R.string.action_call_accept),
+ .addAction(R.drawable.ic_call_end_white, ctx.getText(R.string.action_call_decline),
PendingIntent.getService(ctx, new Random().nextInt(),
- new Intent(LocalService.ACTION_CALL_ACCEPT)
+ new Intent(LocalService.ACTION_CALL_REFUSE)
.setClass(ctx, LocalService.class)
.setData(callUri),
PendingIntent.FLAG_ONE_SHOT))
- .addAction(R.drawable.ic_call_end_white, ctx.getText(R.string.action_call_decline),
+ .addAction(R.drawable.ic_action_accept, ctx.getText(R.string.action_call_accept),
PendingIntent.getService(ctx, new Random().nextInt(),
- new Intent(LocalService.ACTION_CALL_REFUSE)
+ new Intent(LocalService.ACTION_CALL_ACCEPT)
.setClass(ctx, LocalService.class)
.setData(callUri),
PendingIntent.FLAG_ONE_SHOT))
- .addExtras(extras);
+ .addExtras(extras);
} else {
notificationBuilder.setContentTitle(ctx.getString(R.string.notif_outgoing_call_title, contact.getDisplayName()))
.setContentText(ctx.getText(R.string.notif_outgoing_call))
--
GitLab