Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update startPendingIntent to have a View v function parameter." into udc-dev

Browse Source
This commit is contained in:
Xiaowen Lei
2023-04-19 16:21:30 +00:00
committed by Android (Google) Code Review
parent 48645e2746 fa365ee4be
commit e0dfbbbe11
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
View File

@@ -187,7 +187,7 @@ public interface BcSmartspaceDataPlugin extends Plugin {
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 @@ public interface BcSmartspaceDataPlugin extends Plugin {
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 @@ public interface BcSmartspaceDataPlugin extends Plugin {
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);
}
}

6
packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt
View File

@@ -75,7 +75,11 @@ interface SmartspaceViewComponent {
)
}
override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) {
override fun startPendingIntent(
view: View,
pi: PendingIntent,
showOnLockscreen: Boolean
) {
if (showOnLockscreen) {
pi.send()
} else {

6
packages/SystemUI/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceController.kt
View File

@@ -353,7 +353,11 @@ constructor(
}
}
override fun startPendingIntent(pi: PendingIntent, showOnLockscreen: Boolean) {
override fun startPendingIntent(
view: View,
pi: PendingIntent,
showOnLockscreen: Boolean
) {
if (showOnLockscreen) {
pi.send()
} else {