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

Commit ec067e34 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Update startPendingIntent to have a `View v` function parameter." into... 

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

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



Change-Id: Ibb0a0fbdbeacef7b807f6c58eb55e067306d5c2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3f0f2c7 e0dfbbbe

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

+3 −3
Original line number Diff line number Diff line
@@ -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);

    }

}

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

+5 −1
Original line number Diff line number Diff line
@@ -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 {

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

+5 −1
Original line number Diff line number Diff line
@@ -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 {