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

Merge "Establish permanently unavailable settings" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-09 21:13:44 +00:00
committed by Android (Google) Code Review
parent 26453818b9 bd376296cd
commit ab68a8107c
90 changed files with 155 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
View File

@@ -211,7 +211,7 @@ public class SliceBroadcastReceiverTest {
// Disable Setting
Settings.Global.putInt(mContext.getContentResolver(),
FakeToggleController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
// Insert Fake Toggle into Database
final String key = "key";
@@ -245,7 +245,7 @@ public class SliceBroadcastReceiverTest {
// Disable Setting
Settings.Global.putInt(mContext.getContentResolver(),
FakeSliderController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
// Insert Fake Slider into Database
final String key = "key";

6
tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
View File

@@ -330,7 +330,7 @@ public class SliceBuilderUtilsTest {
SliceData.SliceType.SWITCH);
Settings.Global.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.DISABLED_UNSUPPORTED);
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
@@ -373,12 +373,12 @@ public class SliceBuilderUtilsTest {
}
@Test
public void testUnavailableUnknownSlice_validTitleSummary() {
public void testConditionallyUnavailableSlice_validTitleSummary() {
final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
SliceData.SliceType.SWITCH);
Settings.Global.putInt(mContext.getContentResolver(),
FakeUnavailablePreferenceController.AVAILABILITY_KEY,
BasePreferenceController.UNAVAILABLE_UNKNOWN);
BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);