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

Commit 4c3251eb authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Replace SliceAction deprecated method"

parents 830e6d4f 626c6e0b

src/com/android/settings/bluetooth/BluetoothSliceBuilder.java

+4 −3
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ public class BluetoothSliceBuilder { 
                context).getDefaultColor();

        final PendingIntent toggleAction = getBroadcastIntent(context);

        final PendingIntent primaryAction = getPrimaryAction(context);

        final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);

        final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,

                isBluetoothEnabled);

        final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,

                ListBuilder.ICON_IMAGE, title);

        final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,

                null /* actionTitle */, isBluetoothEnabled);



        return new ListBuilder(context, CustomSliceRegistry.BLUETOOTH_URI, ListBuilder.INFINITY)

                .setAccentColor(color)

src/com/android/settings/flashlight/FlashlightSliceBuilder.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class FlashlightSliceBuilder { 
                        .setTitle(context.getText(R.string.power_flashlight))

                        .setTitleItem(icon, ICON_IMAGE)

                        .setPrimaryAction(

                                new SliceAction(toggleAction, null, isFlashlightEnabled(context))))

                                SliceAction.createToggle(toggleAction, null, isFlashlightEnabled(context))))

                .build();

    }

src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ public class BatterySlice implements CustomSliceable { 
        final IconCompat icon = IconCompat.createWithResource(mContext,

                R.drawable.ic_settings_battery);

        final CharSequence title = mContext.getText(R.string.power_usage_summary_title);

        final SliceAction primarySliceAction = new SliceAction(getPrimaryAction(), icon, title);

        final SliceAction primarySliceAction = SliceAction.createDeeplink(getPrimaryAction(), icon,

                ListBuilder.ICON_IMAGE, title);

        final Slice slice = new ListBuilder(mContext, BATTERY_INFO_SLICE_URI, ListBuilder.INFINITY)

                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))

                .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))

src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ public class DataUsageSlice implements CustomSliceable { 
        final IconCompat icon = IconCompat.createWithResource(mContext,

                R.drawable.ic_settings_data_usage);

        final String title = mContext.getString(R.string.data_usage_summary_title);

        final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);

        final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,

                ListBuilder.ICON_IMAGE, title);

        final DataUsageController dataUsageController = new DataUsageController(mContext);

        final DataUsageController.DataUsageInfo info = dataUsageController.getDataUsageInfo();

        final ListBuilder listBuilder =

src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ public class DeviceInfoSlice implements CustomSliceable { 
        final IconCompat icon = IconCompat.createWithResource(mContext,

                R.drawable.ic_info_outline_24dp);

        final String title = mContext.getString(R.string.device_info_label);

        final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);

        final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,

                ListBuilder.ICON_IMAGE, title);

        return new ListBuilder(mContext, CustomSliceRegistry.DEVICE_INFO_SLICE_URI,

                ListBuilder.INFINITY)

                .setAccentColor((Utils.getColorAccentDefaultColor(mContext)))