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

Commit 67c166d8 authored by yoshiki iguchi's avatar yoshiki iguchi Committed by Yoshiki Iguchi
Browse files

Restore "view" argument for notification remote view click handler 

The "view" argument of NotificationRemoteInputManager.Callaback#
handleRemoteViewClick had been removed by ag/4863109, because
this was unused on Android.

But we ARC wants to restore and use it to distinguish the view
issuing a click event.

Bug: 111391270
Test: build passes
Change-Id: I4eb8b80dd68e94ed9dbd457f79f8981fee2e4cd1
parent 755cc665

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+4 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
                ActivityManager.getService().resumeAppSwitches();

            } catch (RemoteException e) {

            }

            return mCallback.handleRemoteViewClick(pendingIntent, () -> {

            return mCallback.handleRemoteViewClick(view, pendingIntent, () -> {

                Pair<Intent, ActivityOptions> options = response.getLaunchOptions(view);

                options.second.setLaunchWindowingMode(

                        WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY);
@@ -658,11 +658,13 @@ public class NotificationRemoteInputManager implements Dumpable { 
         * Performs any special handling for a remote view click. The default behaviour can be

         * called through the defaultHandler parameter.

         *

         * @param view

         * @param pendingIntent

         * @param defaultHandler

         * @return  true iff the click was handled

         */

        boolean handleRemoteViewClick(PendingIntent pendingIntent, ClickHandler defaultHandler);

        boolean handleRemoteViewClick(View view, PendingIntent pendingIntent,

                ClickHandler defaultHandler);

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks { 
    }



    @Override

    public boolean handleRemoteViewClick(PendingIntent pendingIntent,

    public boolean handleRemoteViewClick(View view, PendingIntent pendingIntent,

            NotificationRemoteInputManager.ClickHandler defaultHandler) {

        final boolean isActivity = pendingIntent.isActivity();

        if (isActivity) {