diff options
author | Yi-Ling Chuang <emilychuang@google.com> | 2019-11-27 13:50:50 +0800 |
---|---|---|
committer | Yi-Ling Chuang <emilychuang@google.com> | 2019-12-13 11:43:03 +0800 |
commit | 3f9f068ca9fb10868511848fbff6b573de22dbd5 (patch) | |
tree | 8c516248274784d9048012a3c5f9f9828aee0188 | |
parent | 72af90940d456e5f129407ba7c4f554f549fcf92 (diff) | |
download | packages_apps_Settings-3f9f068ca9fb10868511848fbff6b573de22dbd5.tar.gz packages_apps_Settings-3f9f068ca9fb10868511848fbff6b573de22dbd5.tar.bz2 packages_apps_Settings-3f9f068ca9fb10868511848fbff6b573de22dbd5.zip |
Make some notification related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.
Bug: 141088937
Test: robotests
Change-Id: I6e7b9d45084ea9944143e606bfac56b2cae3e8a3
14 files changed, 70 insertions, 1 deletions
diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java index d6a4110dcd..15657f14d1 100644 --- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java +++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java @@ -42,6 +42,11 @@ public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceCont } @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 ded57b326b..d505227037 100644 --- a/src/com/android/settings/notification/CallVolumePreferenceController.java +++ b/src/com/android/settings/notification/CallVolumePreferenceController.java @@ -44,6 +44,11 @@ public class CallVolumePreferenceController extends VolumeSeekBarPreferenceContr } @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 ae3146cbe5..e18d2e5b1f 100644 --- a/src/com/android/settings/notification/MediaVolumePreferenceController.java +++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java @@ -43,6 +43,11 @@ public class MediaVolumePreferenceController extends VolumeSeekBarPreferenceCont } @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 c82d04b858..0fe0d6282e 100644 --- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java +++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java @@ -45,6 +45,11 @@ public class NotificationVolumePreferenceController extends } @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 802d75ff6d..bb41975fc3 100644 --- a/src/com/android/settings/notification/RemoteVolumePreferenceController.java +++ b/src/com/android/settings/notification/RemoteVolumePreferenceController.java @@ -197,6 +197,11 @@ public class RemoteVolumePreferenceController extends VolumeSeekBarPreferenceCon } @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 08efc931a0..5e7d067a8a 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -96,6 +96,11 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr } @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 b043cb10f3..503b5bc0a8 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -78,6 +78,11 @@ public class VibrateWhenRingPreferenceController extends TogglePreferenceControl } @Override + public boolean isPublicSlice() { + return true; + } + + @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); Preference preference = screen.findPreference(KEY_VIBRATE_WHEN_RINGING); diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 2120cd98e5..5253372d2e 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 966d4e1ac0..ed65d5b943 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 657b352159..7cfcaffb97 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 8e1b015b85..fe4744feca 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 175599a206..44fc04f396 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 e89edb4ba5..5e484a3bfd 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 a1b65c5e74..ec275c1c6a 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(); + } } |