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

Updates to match prebuilts drop

Browse Source 
Test: build
Bug: 77482321
Change-Id: I65a2cffb0a921ef6acb58ff500a7da8a8f870e76
This commit is contained in:
Jason Monk
2018-04-03 18:36:42 -04:00
parent a8c53f7dcb
commit 20210122bd
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import com.android.settings.core.TogglePreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import android.support.v4.graphics.drawable.IconCompat;
import androidx.slice.Slice;
import androidx.slice.builders.SliceAction;
import androidx.slice.builders.ListBuilder;
@@ -164,7 +165,7 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText)
.setPrimaryAction(new SliceAction(contentIntent, null, null))
.setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null))
.addEndItem(sliceAction))
.build();
}
@@ -180,7 +181,7 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle())
.setTitleItem(icon, ICON_IMAGE)
.setSubtitle(subtitleText)
.setPrimaryAction(new SliceAction(contentIntent, null, null)))
.setPrimaryAction(new SliceAction(contentIntent, (IconCompat) null, null)))
.build();
}
@@ -284,24 +285,25 @@ public class SliceBuilderUtils {
switch (controller.getAvailabilityStatus()) {
case DISABLED_UNSUPPORTED:
summary = context.getString(R.string.unsupported_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context), null /* actionIcon */,
primaryAction = new SliceAction(getSettingsIntent(context),
(IconCompat) null /* actionIcon */,
null /* actionTitle */);
break;
case DISABLED_FOR_USER:
summary = context.getString(R.string.disabled_for_user_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data),
null /* actionIcon */, null /* actionTitle */);
(IconCompat) null /* actionIcon */, null /* actionTitle */);
break;
case DISABLED_DEPENDENT_SETTING:
summary = context.getString(R.string.disabled_dependent_setting_summary);
primaryAction = new SliceAction(getContentIntent(context, data),
null /* actionIcon */, null /* actionTitle */);
(IconCompat) null /* actionIcon */, null /* actionTitle */);
break;
case UNAVAILABLE_UNKNOWN:
default:
summary = context.getString(R.string.unknown_unavailability_setting_summary);
primaryAction = new SliceAction(getSettingsIntent(context),
null /* actionIcon */, null /* actionTitle */);
(IconCompat) null /* actionIcon */, null /* actionTitle */);
}
return new ListBuilder(context, data.getUri())