diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java index d6a4110dcdd..15657f14d12 100644 --- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java +++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java @@ -41,6 +41,11 @@ public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceCont return TextUtils.equals(getPreferenceKey(), "alarm_volume"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/notification/CallVolumePreferenceController.java b/src/com/android/settings/notification/CallVolumePreferenceController.java index ded57b326b3..d5052270376 100644 --- a/src/com/android/settings/notification/CallVolumePreferenceController.java +++ b/src/com/android/settings/notification/CallVolumePreferenceController.java @@ -43,6 +43,11 @@ public class CallVolumePreferenceController extends VolumeSeekBarPreferenceContr return TextUtils.equals(getPreferenceKey(), "call_volume"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java index ae3146cbe5a..e18d2e5b1f1 100644 --- a/src/com/android/settings/notification/MediaVolumePreferenceController.java +++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java @@ -42,6 +42,11 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont return TextUtils.equals(getPreferenceKey(), KEY_MEDIA_VOLUME); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/notification/NotificationVolumePreferenceController.java b/src/com/android/settings/notification/NotificationVolumePreferenceController.java index c82d04b858c..0fe0d6282e8 100644 --- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java +++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java @@ -44,6 +44,11 @@ public class NotificationVolumePreferenceController extends return TextUtils.equals(getPreferenceKey(), KEY_NOTIFICATION_VOLUME); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public String getPreferenceKey() { return KEY_NOTIFICATION_VOLUME; diff --git a/src/com/android/settings/notification/RemoteVolumePreferenceController.java b/src/com/android/settings/notification/RemoteVolumePreferenceController.java index 802d75ff6d7..bb41975fc34 100644 --- a/src/com/android/settings/notification/RemoteVolumePreferenceController.java +++ b/src/com/android/settings/notification/RemoteVolumePreferenceController.java @@ -196,6 +196,11 @@ public class RemoteVolumePreferenceController extends VolumeSeekBarPreferenceCon return TextUtils.equals(getPreferenceKey(), KEY_REMOTE_VOLUME); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index 08efc931a0c..5e7d067a8ad 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -95,6 +95,11 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr return TextUtils.equals(getPreferenceKey(), KEY_RING_VOLUME); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean useDynamicSliceSummary() { return true; diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index b043cb10f39..503b5bc0a83 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -77,6 +77,11 @@ public class VibrateWhenRingPreferenceController extends TogglePreferenceControl return TextUtils.equals(getPreferenceKey(), "vibrate_when_ringing"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 2120cd98e5c..5253372d2e6 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -78,4 +78,9 @@ public class AlarmVolumePreferenceControllerTest { public void isSliceableCorrectKey_returnsTrue() { assertThat(mController.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index 966d4e1ac0b..ed65d5b9432 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -102,4 +102,9 @@ public class CallVolumePreferenceControllerTest { new CallVolumePreferenceController(mContext, "bad_key"); assertThat(controller.isSliceable()).isFalse(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java index 657b3521598..7cfcaffb97d 100644 --- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java @@ -63,4 +63,9 @@ public class MediaVolumePreferenceControllerTest { mContext); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index 8e1b015b859..fe4744fecab 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -102,4 +102,9 @@ public class NotificationVolumePreferenceControllerTest { new NotificationVolumePreferenceController(mContext); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/RemoteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RemoteVolumePreferenceControllerTest.java index 175599a2067..44fc04f396f 100644 --- a/tests/robotests/src/com/android/settings/notification/RemoteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RemoteVolumePreferenceControllerTest.java @@ -218,4 +218,9 @@ public class RemoteVolumePreferenceControllerTest { assertThat(mController.mPreference.getProgress()).isEqualTo(CURRENT_POS); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index e89edb4ba5f..5e484a3bfd5 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -104,4 +104,9 @@ public class RingVolumePreferenceControllerTest { new RingVolumePreferenceController(mContext); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } } diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index a1b65c5e74c..ec275c1c6ae 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -44,9 +44,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; @@ -225,4 +225,8 @@ public class VibrateWhenRingPreferenceControllerTest { assertThat(controller.isSliceable()).isFalse(); } + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } }