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

Merge "Return null when setting can't be changed."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-23 16:01:22 +00:00
committed by Android (Google) Code Review
parent 44a05fbb50 417693021e
commit 2626288bfa
5 changed files with 31 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -336,7 +336,7 @@ public class SliceBuilderUtilsTest {
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
assertThat(slice).isNull();
}
@Test
@@ -349,7 +349,7 @@ public class SliceBuilderUtilsTest {
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
assertThat(slice).isNull();
}
@Test
@@ -394,7 +394,7 @@ public class SliceBuilderUtilsTest {
.isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
assertThat(capturedLoggingPair.second)
.isEqualTo(data.getKey());
SliceTester.testSettingsUnavailableSlice(mContext, slice, data);
assertThat(slice).isNull();
}
@Test
@@ -408,16 +408,6 @@ public class SliceBuilderUtilsTest {
assertThat(intentData).isEqualTo(expectedUri);
}
@Test
public void getSettingsIntent_createsIntentToSettings() {
final Intent intent = new Intent(Settings.ACTION_SETTINGS);
final PendingIntent expectedIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
final PendingIntent settingsIntent = SliceBuilderUtils.getSettingsIntent(mContext);
assertThat(expectedIntent).isEqualTo(settingsIntent);
}
private SliceData getDummyData() {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE);
}

16
tests/robotests/src/com/android/settings/testutils/SliceTester.java
View File

@@ -191,20 +191,8 @@ public class SliceTester {
assertThat(toggles).isEmpty();
final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
final int availabilityStatus = SliceBuilderUtils.getPreferenceController(context,
sliceData).getAvailabilityStatus();
switch (availabilityStatus) {
case UNSUPPORTED_ON_DEVICE:
case CONDITIONALLY_UNAVAILABLE:
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getSettingsIntent(context));
break;
case DISABLED_FOR_USER:
case DISABLED_DEPENDENT_SETTING:
assertThat(primaryPendingIntent).isEqualTo(
SliceBuilderUtils.getContentPendingIntent(context, sliceData));
break;
}
assertThat(primaryPendingIntent).isEqualTo(SliceBuilderUtils.getContentPendingIntent(
context, sliceData));
final List<SliceItem> sliceItems = slice.getItems();
assertTitle(sliceItems, sliceData.getTitle());

4
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
View File

@@ -114,7 +114,7 @@ public class WifiCallingSliceHelperTest {
final Slice slice = mWfcSliceHelper.createWifiCallingSlice(mWfcURI);
testWifiCallingSettingsUnavailableSlice(slice, null,
SliceBuilderUtils.getSettingsIntent(mContext));
WifiCallingSliceHelper.getSettingsIntent(mContext));
}
@Test
@@ -125,7 +125,7 @@ public class WifiCallingSliceHelperTest {
assertThat(mWfcSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
testWifiCallingSettingsUnavailableSlice(slice, null,
SliceBuilderUtils.getSettingsIntent(mContext));
WifiCallingSliceHelper.getSettingsIntent(mContext));
}
@Test