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

Commit 9a3380c0 authored by Petr Cermak's avatar Petr Cermak
Browse files

Set "results source" on RemoteInput intents sent from System UI 

If the input comes from RemoteInputView (the user manually typed an
inline reply), the source is set to RemoteInput.SOURCE_FREE_FORM_INPUT.
If the input comes from SmartReplyView (the user tapped on a smart reply
button), the source is set to RemoteInput.SOURCE_CHOICE.

Bug: 67765414
Test: atest RemoteInputViewTest SmartReplyViewTest
Change-Id: Icff46b903a968bd8457624b358d626b457569352
parent f12f652c

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
        Intent fillInIntent = new Intent().addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        RemoteInput.addResultsToIntent(mRemoteInputs, fillInIntent,

                results);

        RemoteInput.setResultsSource(fillInIntent, RemoteInput.SOURCE_FREE_FORM_INPUT);



        mEditText.setEnabled(false);

        mSendButton.setVisibility(INVISIBLE);

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class SmartReplyView extends LinearLayout { 
            results.putString(remoteInput.getResultKey(), choice.toString());

            Intent intent = new Intent().addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            RemoteInput.addResultsToIntent(new RemoteInput[]{remoteInput}, intent, results);

            RemoteInput.setResultsSource(intent, RemoteInput.SOURCE_CHOICE);

            try {

                pendingIntent.send(context, 0, intent);

            } catch (PendingIntent.CanceledException e) {

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

 * except in compliance with the License. You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software distributed under the

 * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied. See the License for the specific language governing

 * permissions and limitations under the License.

 */



package com.android.systemui.statusbar.policy;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;



import java.util.concurrent.ArrayBlockingQueue;

import java.util.concurrent.BlockingQueue;

import java.util.concurrent.TimeUnit;



/** A simple receiver to wait for broadcast intents in tests. */

public class BlockingQueueIntentReceiver extends BroadcastReceiver {

    private final BlockingQueue<Intent> mQueue = new ArrayBlockingQueue<Intent>(1);



    @Override

    public void onReceive(Context context, Intent intent) {

        mQueue.add(intent);

    }



    public Intent waitForIntent() throws InterruptedException {

        return mQueue.poll(10, TimeUnit.SECONDS);

    }

}

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

0 → 100644
+91 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

 * except in compliance with the License. You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software distributed under the

 * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied. See the License for the specific language governing

 * permissions and limitations under the License.

 */



package com.android.systemui.statusbar.policy;



import static junit.framework.Assert.assertEquals;



import android.app.PendingIntent;

import android.app.RemoteInput;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.ShortcutManager;

import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.widget.EditText;

import android.widget.ImageButton;



import com.android.systemui.R;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.NotificationTestHelper;

import com.android.systemui.statusbar.RemoteInputController;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

@SmallTest

public class RemoteInputViewTest extends SysuiTestCase {



    private static final String TEST_RESULT_KEY = "test_result_key";

    private static final String TEST_REPLY = "hello";

    private static final String TEST_ACTION = "com.android.ACTION";



    @Mock private RemoteInputController mController;

    @Mock private ShortcutManager mShortcutManager;

    private BlockingQueueIntentReceiver mReceiver;

    private RemoteInputView mView;



    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        mReceiver = new BlockingQueueIntentReceiver();

        mContext.registerReceiver(mReceiver, new IntentFilter(TEST_ACTION));



        // Avoid SecurityException RemoteInputView#sendRemoteInput().

        mContext.addMockSystemService(ShortcutManager.class, mShortcutManager);



        ExpandableNotificationRow row = new NotificationTestHelper(mContext).createRow();

        mView = RemoteInputView.inflate(mContext, null, row.getEntry(), mController);

    }



    @Test

    public void testSendRemoteInput_intentContainsResultsAndSource() throws InterruptedException {

        PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0,

                new Intent(TEST_ACTION), 0);

        RemoteInput input = new RemoteInput.Builder(TEST_RESULT_KEY).build();



        mView.setPendingIntent(pendingIntent);

        mView.setRemoteInput(new RemoteInput[]{input}, input);

        mView.focus();



        EditText editText = mView.findViewById(R.id.remote_input_text);

        editText.setText(TEST_REPLY);

        ImageButton sendButton = mView.findViewById(R.id.remote_input_send);

        sendButton.performClick();



        Intent resultIntent = mReceiver.waitForIntent();

        assertEquals(TEST_REPLY,

                RemoteInput.getResultsFromIntent(resultIntent).get(TEST_RESULT_KEY));

        assertEquals(RemoteInput.SOURCE_FREE_FORM_INPUT,

                RemoteInput.getResultsSource(resultIntent));

    }

}

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

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

 * except in compliance with the License. You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software distributed under the

 * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

 * KIND, either express or implied. See the License for the specific language governing

 * permissions and limitations under the License.

 */



package com.android.systemui.statusbar.policy;



import static junit.framework.Assert.assertEquals;



import android.app.PendingIntent;

import android.app.RemoteInput;

import android.content.Intent;

import android.content.IntentFilter;

import android.support.test.filters.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import com.android.systemui.SysuiTestCase;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

@SmallTest

public class SmartReplyViewTest extends SysuiTestCase {



    private static final String TEST_RESULT_KEY = "test_result_key";

    private static final String TEST_ACTION = "com.android.ACTION";

    private static final String[] TEST_CHOICES = new String[]{"Hello", "What's up?", "I'm here"};



    private BlockingQueueIntentReceiver mReceiver;

    private SmartReplyView mView;



    @Before

    public void setUp() {

        mReceiver = new BlockingQueueIntentReceiver();

        mContext.registerReceiver(mReceiver, new IntentFilter(TEST_ACTION));



        mView = SmartReplyView.inflate(mContext, null);

    }



    @Test

    public void testSendSmartReply_intentContainsResultsAndSource() throws InterruptedException {

        PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0,

                new Intent(TEST_ACTION), 0);

        RemoteInput input = new RemoteInput.Builder(TEST_RESULT_KEY).setChoices(

                TEST_CHOICES).build();



        mView.setRepliesFromRemoteInput(input, pendingIntent);



        mView.getChildAt(2).performClick();



        Intent resultIntent = mReceiver.waitForIntent();

        assertEquals(TEST_CHOICES[2],

                RemoteInput.getResultsFromIntent(resultIntent).get(TEST_RESULT_KEY));

        assertEquals(RemoteInput.SOURCE_CHOICE, RemoteInput.getResultsSource(resultIntent));

    }

}