PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update to match now slice APIs"

Browse Source 
This reverts commit 2d96005aba.

Reason for revert: prebuilt revert

Bug: 73903252
Bug: 73876473
Bug: 73875529
Bug: 73866916
Change-Id: I5d47a7c5ddebc16c1c508f5bb48ace809cbaf273
This commit is contained in:
Alan Viverette
2018-02-27 20:12:57 +00:00
parent 2d96005aba
commit 80c806abd6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -35,7 +35,6 @@ import java.util.WeakHashMap;
import androidx.app.slice.Slice; import androidx.app.slice.Slice;
import androidx.app.slice.SliceProvider; import androidx.app.slice.SliceProvider;
import androidx.app.slice.builders.SliceAction;
import androidx.app.slice.builders.ListBuilder; import androidx.app.slice.builders.ListBuilder;
/** /**
@@ -174,9 +173,8 @@ public class SettingsSliceProvider extends SliceProvider {
.setTitle(getContext().getString(R.string.wifi_settings)) .setTitle(getContext().getString(R.string.wifi_settings))
.setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal)) .setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal))
.setSubtitle(state) .setSubtitle(state)
.addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED), .addToggle(getBroadcastIntent(ACTION_WIFI_CHANGED), finalWifiEnabled)
null, finalWifiEnabled)) .setContentIntent(getIntent(Intent.ACTION_MAIN)))
.setPrimaryAction(new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))
.build(); .build();
} }

5
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -34,7 +34,6 @@ import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import androidx.app.slice.Slice; import androidx.app.slice.Slice;
import androidx.app.slice.builders.SliceAction;
import androidx.app.slice.builders.ListBuilder; import androidx.app.slice.builders.ListBuilder;
import androidx.app.slice.builders.ListBuilder.RowBuilder; import androidx.app.slice.builders.ListBuilder.RowBuilder;
@@ -64,7 +63,7 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle()) .setTitle(sliceData.getTitle())
.setTitleItem(icon) .setTitleItem(icon)
.setSubtitle(subtitleText) .setSubtitle(subtitleText)
.setPrimaryAction(new SliceAction(contentIntent, null, null)); .setContentIntent(contentIntent);
// TODO (b/71640747) Respect setting availability. // TODO (b/71640747) Respect setting availability.
@@ -101,7 +100,7 @@ public class SliceBuilderUtils {
String key) { String key) {
PendingIntent actionIntent = getActionIntent(context, PendingIntent actionIntent = getActionIntent(context,
SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key); SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);
builder.addEndItem(new SliceAction(actionIntent, null, isChecked)); builder.addToggle(actionIntent, isChecked);
} }
private static PendingIntent getActionIntent(Context context, String action, String key) { private static PendingIntent getActionIntent(Context context, String action, String key) {