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

Commit 2d96005a authored by Jason Monk's avatar Jason Monk
Browse files

Update to match now slice APIs 

Test: make
Change-Id: Ie74e1b179f80e1d0faf259bd22b3ae4e953a0726
parent 38bfe2e4

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

+4 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import java.util.WeakHashMap; 


import androidx.app.slice.Slice;

import androidx.app.slice.SliceProvider;

import androidx.app.slice.builders.SliceAction;

import androidx.app.slice.builders.ListBuilder;



/**
@@ -173,8 +174,9 @@ public class SettingsSliceProvider extends SliceProvider { 
                        .setTitle(getContext().getString(R.string.wifi_settings))

                        .setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal))

                        .setSubtitle(state)

                        .addToggle(getBroadcastIntent(ACTION_WIFI_CHANGED), finalWifiEnabled)

                        .setContentIntent(getIntent(Intent.ACTION_MAIN)))

                        .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),

                                null, finalWifiEnabled))

                        .setPrimaryAction(new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))

                .build();

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settings.search.DatabaseIndexingUtils; 
import com.android.settingslib.core.AbstractPreferenceController;



import androidx.app.slice.Slice;

import androidx.app.slice.builders.SliceAction;

import androidx.app.slice.builders.ListBuilder;

import androidx.app.slice.builders.ListBuilder.RowBuilder;
@@ -63,7 +64,7 @@ public class SliceBuilderUtils { 
                .setTitle(sliceData.getTitle())

                .setTitleItem(icon)

                .setSubtitle(subtitleText)

                .setContentIntent(contentIntent);

                .setPrimaryAction(new SliceAction(contentIntent, null, null));



        // TODO (b/71640747) Respect setting availability.
@@ -100,7 +101,7 @@ public class SliceBuilderUtils { 
            String key) {

        PendingIntent actionIntent = getActionIntent(context,

                SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);

        builder.addToggle(actionIntent, isChecked);

        builder.addEndItem(new SliceAction(actionIntent, null, isChecked));

    }



    private static PendingIntent getActionIntent(Context context, String action, String key) {