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

Commit b6323b96 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set slice uri as data in PendingIntent."

parents e994d466 66d4f77d

src/com/android/settings/slices/SliceBuilderUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -168,10 +168,11 @@ public class SliceBuilderUtils { 
     * @return {@link PendingIntent} for a non-primary {@link SliceAction}.

     */

    public static PendingIntent getActionIntent(Context context, String action, SliceData data) {

        final Intent intent = new Intent(action);

        intent.setClass(context, SliceBroadcastReceiver.class);

        intent.putExtra(EXTRA_SLICE_KEY, data.getKey());

        intent.putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());

        final Intent intent = new Intent(action)

                .setData(data.getUri())

                .setClass(context, SliceBroadcastReceiver.class)

                .putExtra(EXTRA_SLICE_KEY, data.getKey())

                .putExtra(EXTRA_SLICE_PLATFORM_DEFINED, data.isPlatformDefined());

        return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,

                PendingIntent.FLAG_CANCEL_CURRENT);

    }

tests/robotests/src/com/android/settings/testutils/SliceTester.java

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ public class SliceTester { 


        final SliceAction mainToggleAction = toggles.get(0);



        final IconCompat expectedToggleIcon = IconCompat.createWithResource(context,

                sliceData.getIconResource());

        assertThat(mainToggleAction.getIcon()).isNull();



        // Check intent in Toggle Action