diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index af49f3d9541..040af9f7d20 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -55,6 +55,11 @@ public class SmartBatteryPreferenceController extends BasePreferenceController i return TextUtils.equals(getPreferenceKey(), "smart_battery"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public void updateState(Preference preference) { super.updateState(preference); diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 56e90ffc677..1f4690e087f 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -59,7 +59,7 @@ public class BatterySaverButtonPreferenceController extends } @Override - public boolean isSliceable() { + public boolean isPublicSlice() { return true; } diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 1dc95884c3b..3c79be34d1c 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -103,7 +103,7 @@ public class AirplaneModePreferenceController extends TogglePreferenceController } @Override - public boolean isSliceable() { + public boolean isPublicSlice() { return true; } diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 34e7e24efd6..9bf013c8c3f 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -23,7 +23,7 @@ import android.net.Uri; import android.nfc.NfcAdapter; import android.provider.Settings; import android.util.Log; -import androidx.annotation.VisibleForTesting; + import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; @@ -90,7 +90,7 @@ public class NfcPreferenceController extends TogglePreferenceController } @Override - public boolean isSliceable() { + public boolean isPublicSlice() { return true; } diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java index 12dbd5749ca..4e548d141b7 100644 --- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java +++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java @@ -77,7 +77,7 @@ public class SecureNfcPreferenceController extends TogglePreferenceController } @Override - public boolean isSliceable() { + public boolean isPublicSlice() { return true; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 7bc6ead2e80..91e7b0486d3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -120,4 +120,9 @@ public class SmartBatteryPreferenceControllerTest { new SmartBatteryPreferenceController(null); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnsTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 8609599f950..c01c174561e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -110,4 +110,9 @@ public class BatterySaverButtonPreferenceControllerTest { verify(mPowerManager).setPowerSaveModeEnabled(false); } + + @Test + public void isPublicSlice_returnsTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index fb297fb19aa..a0524fb0535 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -191,4 +191,9 @@ public class AirplaneModePreferenceControllerTest { public void isSliceable_returnsTrue() { assertThat(mController.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnsTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index b6c8f370642..872c7124119 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; -import android.net.Uri; import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.UserManager; @@ -36,7 +35,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker; import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker.NfcUpdateReceiver; -import com.android.settings.slices.SliceBuilderUtils; import org.junit.Before; import org.junit.Test; @@ -286,4 +284,9 @@ public class NfcPreferenceControllerTest { verify(worker).updateSlice(); } + + @Test + public void isPublicSlice_returnsTrue() { + assertThat(mNfcController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java new file mode 100644 index 00000000000..56f012acfd0 --- /dev/null +++ b/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.nfc; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.Context; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class SecureNfcPreferenceControllerTest { + + private Context mContext; + private SecureNfcPreferenceController mController; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + mController = new SecureNfcPreferenceController(mContext, "nfc_secure_settings"); + } + + @Test + public void isPublicSlice_returnsTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } +}