Update startPendingIntent to have a `View v` function parameter. The `View v` parameter can be used to construct a custom ActivityOptions for launching animations. No behavior change. Bug: 274104981 Test: N/A; passing existing tests. Change-Id: I26f1f4c967a153697d4a6e38ea3a14b441c47bb5
diff --git a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index e0d0184..1811c02 100644 --- a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
@@ -187,7 +187,7 @@ if (action.getIntent() != null) { startIntent(v, action.getIntent(), showOnLockscreen); } else if (action.getPendingIntent() != null) { - startPendingIntent(action.getPendingIntent(), showOnLockscreen); + startPendingIntent(v, action.getPendingIntent(), showOnLockscreen); } } catch (ActivityNotFoundException e) { Log.w(TAG, "Could not launch intent for action: " + action, e); @@ -199,7 +199,7 @@ if (action.getIntent() != null) { startIntent(v, action.getIntent(), showOnLockscreen); } else if (action.getPendingIntent() != null) { - startPendingIntent(action.getPendingIntent(), showOnLockscreen); + startPendingIntent(v, action.getPendingIntent(), showOnLockscreen); } } catch (ActivityNotFoundException e) { Log.w(TAG, "Could not launch intent for action: " + action, e); @@ -210,6 +210,6 @@ void startIntent(View v, Intent i, boolean showOnLockscreen); /** Start the PendingIntent */ - void startPendingIntent(PendingIntent pi, boolean showOnLockscreen); + void startPendingIntent(View v, PendingIntent pi, boolean showOnLockscreen); } }
diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt index 26149321..ba9d13d 100644 --- a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt
@@ -75,7 +75,11 @@ ) } - override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) { + override fun startPendingIntent( + view: View, + pi: PendingIntent, + showOnLockscreen: Boolean + ) { if (showOnLockscreen) { pi.send() } else {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt index 826e289..950dbd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
@@ -353,7 +353,11 @@ } } - override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) { + override fun startPendingIntent( + view: View, + pi: PendingIntent, + showOnLockscreen: Boolean + ) { if (showOnLockscreen) { pi.send() } else {