Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Action button order in CallStyle Notifications" into tm-qpr-dev

Browse Source
This commit is contained in:
András Kurucz
2022-10-14 15:00:06 +00:00
committed by Android (Google) Code Review
parent 6cd920ce5f d6e8b78159
commit e58df67a4f
2 changed files with 121 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/app/Notification.java
View File

@@ -9591,21 +9591,16 @@ public class Notification implements Parcelable
@NonNull
public ArrayList<Action> getActionsListWithSystemActions() {
// Define the system actions we expect to see
final Action negativeAction = makeNegativeAction();
final Action answerAction = makeAnswerAction();
// Sort the expected actions into the correct order:
// * If there's no answer action, put the hang up / decline action at the end
// * Otherwise put the answer action at the end, and put the decline action at start.
final Action firstAction = answerAction == null ? null : negativeAction;
final Action lastAction = answerAction == null ? negativeAction : answerAction;
final Action firstAction = makeNegativeAction();
final Action lastAction = makeAnswerAction();
// Start creating the result list.
int nonContextualActionSlotsRemaining = MAX_ACTION_BUTTONS;
ArrayList<Action> resultActions = new ArrayList<>(MAX_ACTION_BUTTONS);
if (firstAction != null) {
resultActions.add(firstAction);
--nonContextualActionSlotsRemaining;
}
// Always have a first action.
resultActions.add(firstAction);
--nonContextualActionSlotsRemaining;
// Copy actions into the new list, correcting system actions.
if (mBuilder.mActions != null) {
@@ -9621,14 +9616,14 @@ public class Notification implements Parcelable
--nonContextualActionSlotsRemaining;
}
// If there's exactly one action slot left, fill it with the lastAction.
if (nonContextualActionSlotsRemaining == 1) {
if (lastAction != null && nonContextualActionSlotsRemaining == 1) {
resultActions.add(lastAction);
--nonContextualActionSlotsRemaining;
}
}
}
// If there are any action slots left, the lastAction still needs to be added.
if (nonContextualActionSlotsRemaining >= 1) {
if (lastAction != null && nonContextualActionSlotsRemaining >= 1) {
resultActions.add(lastAction);
}
return resultActions;

114
core/tests/coretests/src/android/app/NotificationTest.java
View File

@@ -59,6 +59,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.spy;
import android.annotation.Nullable;
import android.app.Notification.CallStyle;
import android.content.Context;
import android.content.Intent;
import android.content.LocusId;
@@ -92,6 +93,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.List;
import java.util.function.Consumer;
@RunWith(AndroidJUnit4.class)
@@ -530,6 +532,108 @@ public class NotificationTest {
.isGreaterThan(ContrastColorUtil.calculateLuminance(background));
}
@Test
public void testCallStyle_getSystemActions_forIncomingCall() {
PendingIntent answerIntent = createPendingIntent("answer");
PendingIntent declineIntent = createPendingIntent("decline");
Notification.CallStyle style = Notification.CallStyle.forIncomingCall(
new Person.Builder().setName("A Caller").build(),
declineIntent,
answerIntent
);
style.setBuilder(new Notification.Builder(mContext, "Channel"));
List<Notification.Action> actions = style.getActionsListWithSystemActions();
assertEquals(2, actions.size());
assertEquals(declineIntent, actions.get(0).actionIntent);
assertEquals(answerIntent, actions.get(1).actionIntent);
}
@Test
public void testCallStyle_getSystemActions_forOngoingCall() {
PendingIntent hangUpIntent = createPendingIntent("hangUp");
Notification.CallStyle style = Notification.CallStyle.forOngoingCall(
new Person.Builder().setName("A Caller").build(),
hangUpIntent
);
style.setBuilder(new Notification.Builder(mContext, "Channel"));
List<Notification.Action> actions = style.getActionsListWithSystemActions();
assertEquals(1, actions.size());
assertEquals(hangUpIntent, actions.get(0).actionIntent);
}
@Test
public void testCallStyle_getSystemActions_forIncomingCallWithOtherActions() {
PendingIntent answerIntent = createPendingIntent("answer");
PendingIntent declineIntent = createPendingIntent("decline");
Notification.CallStyle style = Notification.CallStyle.forIncomingCall(
new Person.Builder().setName("A Caller").build(),
declineIntent,
answerIntent
);
Notification.Action actionToKeep = makeNotificationAction(null);
Notification.Action actionToDrop = makeNotificationAction(null);
Notification.Builder notifBuilder = new Notification.Builder(mContext, "Channel")
.addAction(actionToKeep)
.addAction(actionToDrop); //expect to move this action to the end
style.setBuilder(notifBuilder); //add a builder with actions
List<Notification.Action> actions = style.getActionsListWithSystemActions();
assertEquals(4, actions.size());
assertEquals(declineIntent, actions.get(0).actionIntent);
assertEquals(actionToKeep, actions.get(1));
assertEquals(answerIntent, actions.get(2).actionIntent);
assertEquals(actionToDrop, actions.get(3));
}
@Test
public void testCallStyle_getSystemActions_forOngoingCallWithOtherActions() {
PendingIntent hangUpIntent = createPendingIntent("hangUp");
Notification.CallStyle style = Notification.CallStyle.forOngoingCall(
new Person.Builder().setName("A Caller").build(),
hangUpIntent
);
Notification.Action firstAction = makeNotificationAction(null);
Notification.Action secondAction = makeNotificationAction(null);
Notification.Builder notifBuilder = new Notification.Builder(mContext, "Channel")
.addAction(firstAction)
.addAction(secondAction);
style.setBuilder(notifBuilder); //add a builder with actions
List<Notification.Action> actions = style.getActionsListWithSystemActions();
assertEquals(3, actions.size());
assertEquals(hangUpIntent, actions.get(0).actionIntent);
assertEquals(firstAction, actions.get(1));
assertEquals(secondAction, actions.get(2));
}
@Test
public void testCallStyle_getSystemActions_dropsOldSystemActions() {
PendingIntent hangUpIntent = createPendingIntent("decline");
Notification.CallStyle style = Notification.CallStyle.forOngoingCall(
new Person.Builder().setName("A Caller").build(),
hangUpIntent
);
Bundle actionExtras = new Bundle();
actionExtras.putBoolean("key_action_priority", true);
Notification.Action oldSystemAction = makeNotificationAction(
builder -> builder.addExtras(actionExtras)
);
Notification.Builder notifBuilder = new Notification.Builder(mContext, "Channel")
.addAction(oldSystemAction);
style.setBuilder(notifBuilder); //add a builder with actions
List<Notification.Action> actions = style.getActionsListWithSystemActions();
assertFalse("Old versions of system actions should be dropped.",
actions.contains(oldSystemAction));
}
@Test
public void testBuild_ensureSmallIconIsNotTooBig_resizesIcon() {
Icon hugeIcon = Icon.createWithBitmap(
@@ -788,7 +892,7 @@ public class NotificationTest {
@Test
public void testRestoreFromExtras_Call_invalidExtra_noCrash() {
Notification.Style style = new Notification.CallStyle();
Notification.Style style = new CallStyle();
Bundle fakeTypes = new Bundle();
fakeTypes.putParcelable(EXTRA_CALL_PERSON, new Bundle());
fakeTypes.putParcelable(EXTRA_ANSWER_INTENT, new Bundle());
@@ -962,4 +1066,12 @@ public class NotificationTest {
}
return actionBuilder.build();
}
/**
* Creates a PendingIntent with the given action.
*/
private PendingIntent createPendingIntent(String action) {
return PendingIntent.getActivity(mContext, 0, new Intent(action),
PendingIntent.FLAG_MUTABLE);
}
}