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

Commit a9130f13 authored by Song Hu's avatar Song Hu Committed by Automerger Merge Worker
Browse files

Merge "Pass Intent as additional parameter in... 

Merge "Pass Intent as additional parameter in ContentSuggestionsServiceClient#notifyAction. This allows QuickShareProcessor to report share event in notifyInteraction. SystemUI side change." into sc-dev am: 6a075b5e am: 02035929

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

Change-Id: Ia3b373c6400f5308e851940af802831608ab1277
parents 44b5a6b5 02035929

packages/SystemUI/src/com/android/systemui/screenshot/ActionProxyReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class ActionProxyReceiver extends BroadcastReceiver { 
                    ? ACTION_TYPE_EDIT

                    : ACTION_TYPE_SHARE;

            mScreenshotSmartActions.notifyScreenshotAction(

                    context, intent.getStringExtra(EXTRA_ID), actionType, false);

                    context, intent.getStringExtra(EXTRA_ID), actionType, false, null);

        }

    }

}

packages/SystemUI/src/com/android/systemui/screenshot/DeleteScreenshotReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class DeleteScreenshotReceiver extends BroadcastReceiver { 
        });

        if (intent.getBooleanExtra(EXTRA_SMART_ACTIONS_ENABLED, false)) {

            mScreenshotSmartActions.notifyScreenshotAction(

                    context, intent.getStringExtra(EXTRA_ID), ACTION_TYPE_DELETE, false);

                    context, intent.getStringExtra(EXTRA_ID), ACTION_TYPE_DELETE, false, null);

        }

    }

}

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationSmartActionsProvider.java

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.systemui.screenshot.LogConfig.logTag; 


import android.app.Notification;

import android.content.ComponentName;

import android.content.Intent;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.UserHandle;
@@ -107,7 +108,8 @@ public class ScreenshotNotificationSmartActionsProvider { 
     * @param action        type of notification action invoked.

     * @param isSmartAction whether action invoked was a smart action.

     */

    public void notifyAction(String screenshotId, String action, boolean isSmartAction) {

    public void notifyAction(String screenshotId, String action, boolean isSmartAction,

            Intent intent) {

        if (DEBUG_ACTIONS) {

            Log.d(TAG, "SmartActions: notifyAction: return without notify");

        }

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotSmartActions.java

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.app.ActivityManager; 
import android.app.Notification;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.Handler;
@@ -165,7 +166,7 @@ public class ScreenshotSmartActions { 
    }



    void notifyScreenshotAction(Context context, String screenshotId, String action,

            boolean isSmartAction) {

            boolean isSmartAction, Intent intent) {

        try {

            ScreenshotNotificationSmartActionsProvider provider =

                    SystemUIFactory.getInstance().createScreenshotNotificationSmartActionsProvider(
@@ -174,7 +175,7 @@ public class ScreenshotSmartActions { 
                Log.d(TAG, String.format("%s notifyAction: %s id=%s, isSmartAction=%b",

                        provider.getClass(), action, screenshotId, isSmartAction));

            }

            provider.notifyAction(screenshotId, action, isSmartAction);

            provider.notifyAction(screenshotId, action, isSmartAction, intent);

        } catch (Throwable e) {

            Log.e(TAG, "Error in notifyScreenshotAction: ", e);

        }

packages/SystemUI/src/com/android/systemui/screenshot/SmartActionsReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class SmartActionsReceiver extends BroadcastReceiver { 
        }



        mScreenshotSmartActions.notifyScreenshotAction(

                context, intent.getStringExtra(EXTRA_ID), actionType, true);

                context, intent.getStringExtra(EXTRA_ID), actionType, true,

                pendingIntent.getIntent());

    }

}