Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 621138cc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: 3e78552e am: 9c322124

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2717545



Change-Id: Ieeb2c9e89ac69225e3157779516c5d3e7a80ace1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b22aa3f7 9c322124

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/InflatedSmartRepliesTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ import java.util.List; 
public class InflatedSmartRepliesTest extends SysuiTestCase {

public class InflatedSmartRepliesTest extends SysuiTestCase {





    private static final Intent TEST_INTENT = new Intent("com.android.SMART_REPLY_VIEW_ACTION");

    private static final Intent TEST_INTENT = new Intent("com.android.SMART_REPLY_VIEW_ACTION");

    private static final Intent WHITELISTED_TEST_INTENT =

    private static final Intent ALLOWLISTED_TEST_INTENT =

            new Intent("com.android.WHITELISTED_TEST_ACTION");

            new Intent("com.android.WHITELISTED_TEST_ACTION");





    @Mock private SmartReplyConstants mSmartReplyConstants;

    @Mock private SmartReplyConstants mSmartReplyConstants;
@@ -343,7 +343,7 @@ public class InflatedSmartRepliesTest extends SysuiTestCase { 




        assertThat(smartReplyState.getSmartReplies().choices)

        assertThat(smartReplyState.getSmartReplies().choices)

                .containsExactlyElementsIn(mEntry.getSmartReplies()).inOrder();

                .containsExactlyElementsIn(mEntry.getSmartReplies()).inOrder();

        // Since no apps are whitelisted no actions should be shown.

        // Since no apps are allowlisted no actions should be shown.

        assertThat(smartReplyState.getSmartActions().actions).isEmpty();

        assertThat(smartReplyState.getSmartActions().actions).isEmpty();

        assertThat(smartReplyState.getSuppressedActions()).isNull();

        assertThat(smartReplyState.getSuppressedActions()).isNull();

        assertThat(smartReplyState.getHasPhishingAction()).isFalse();

        assertThat(smartReplyState.getHasPhishingAction()).isFalse();
@@ -358,7 +358,7 @@ public class InflatedSmartRepliesTest extends SysuiTestCase { 
        allowedResolveInfo.activityInfo.packageName = allowedPackage;

        allowedResolveInfo.activityInfo.packageName = allowedPackage;

        when(mPackageManagerWrapper

        when(mPackageManagerWrapper

                .resolveActivity(

                .resolveActivity(

                        argThat(intent -> WHITELISTED_TEST_INTENT.getAction().equals(

                        argThat(intent -> ALLOWLISTED_TEST_INTENT.getAction().equals(

                                intent.getAction())),

                                intent.getAction())),

                        anyInt() /* flags */))

                        anyInt() /* flags */))

                .thenReturn(allowedResolveInfo);

                .thenReturn(allowedResolveInfo);
@@ -368,7 +368,7 @@ public class InflatedSmartRepliesTest extends SysuiTestCase { 
        // suggestions.

        // suggestions.

        setupAppGeneratedReplies(null /* smartReplies */);

        setupAppGeneratedReplies(null /* smartReplies */);

        ArrayList<Notification.Action> actions = new ArrayList<>();

        ArrayList<Notification.Action> actions = new ArrayList<>();

        actions.add(createAction("allowed action", WHITELISTED_TEST_INTENT));

        actions.add(createAction("allowed action", ALLOWLISTED_TEST_INTENT));

        actions.add(createAction("non-allowed action", TEST_INTENT));

        actions.add(createAction("non-allowed action", TEST_INTENT));





        modifyRanking(mEntry)

        modifyRanking(mEntry)
@@ -379,7 +379,7 @@ public class InflatedSmartRepliesTest extends SysuiTestCase { 
        InflatedSmartReplyState smartReplyState =

        InflatedSmartReplyState smartReplyState =

                mSmartReplyStateInflater.chooseSmartRepliesAndActions(mEntry);

                mSmartReplyStateInflater.chooseSmartRepliesAndActions(mEntry);





        // Only the action for the whitelisted package should be allowed.

        // Only the action for the allowlisted package should be allowed.

        assertThat(smartReplyState.getSmartActions().actions)

        assertThat(smartReplyState.getSmartActions().actions)

                .containsExactly(mEntry.getSmartActions().get(0));

                .containsExactly(mEntry.getSmartActions().get(0));

        assertThat(smartReplyState.getSuppressedActions()).isNull();

        assertThat(smartReplyState.getSuppressedActions()).isNull();