diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 751bb798aba..3d2e1768b2e 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -60,6 +60,11 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override protected String getVideoPrefKey() { return PREF_KEY_VIDEO; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index 4abf09af120..c3171b8e2db 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -77,6 +77,11 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_screen"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean setChecked(boolean isChecked) { return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index d4c63c0a76b..afc5074ef35 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -77,6 +77,11 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController return TextUtils.equals(getPreferenceKey(), "gesture_double_twist"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override protected String getVideoPrefKey() { return PREF_KEY_VIDEO; diff --git a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java b/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java index b980499ef90..32a7ba55158 100644 --- a/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java +++ b/src/com/android/settings/gestures/GlobalActionsPanelPreferenceController.java @@ -60,6 +60,11 @@ public class GlobalActionsPanelPreferenceController extends GesturePreferenceCon return TextUtils.equals(getPreferenceKey(), TOGGLE_KEY); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean isChecked() { int enabled = Settings.Secure.getInt(mContext.getContentResolver(), ENABLED_SETTING, 0); diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 0738a51f0ff..c1590bfd606 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -72,6 +72,11 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll return TextUtils.equals(getPreferenceKey(), "gesture_pick_up"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override protected String getVideoPrefKey() { return PREF_KEY_VIDEO; diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index 104abf98d1c..af541ff161a 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java @@ -65,6 +65,11 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo return TextUtils.equals(getPreferenceKey(), "gesture_swipe_down_fingerprint"); } + @Override + public boolean isPublicSlice() { + return true; + } + @Override public boolean setChecked(boolean isChecked) { setSwipeToNotification(mContext, isChecked); diff --git a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java index ba2b86973fe..179ed262a20 100644 --- a/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java +++ b/src/com/android/settings/gestures/TapScreenGesturePreferenceController.java @@ -23,7 +23,6 @@ import android.content.Context; import android.hardware.display.AmbientDisplayConfiguration; import android.os.UserHandle; import android.provider.Settings; -import android.text.TextUtils; public class TapScreenGesturePreferenceController extends GesturePreferenceController { @@ -54,7 +53,7 @@ public class TapScreenGesturePreferenceController extends GesturePreferenceContr } @Override - public boolean isSliceable() { + public boolean isPublicSlice() { return true; } diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index fac5ae81022..75826995a0f 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -140,4 +140,9 @@ public class DoubleTapPowerPreferenceControllerTest { new DoubleTapPowerPreferenceController(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/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index 0dc7a78999a..edcbd764013 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -129,4 +129,9 @@ public class DoubleTapScreenPreferenceControllerTest { new DoubleTapScreenPreferenceController(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/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 0efbf574165..7bdd2623456 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -170,4 +170,9 @@ public class DoubleTwistPreferenceControllerTest { new DoubleTwistPreferenceController(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/gestures/GlobalActionsPanelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java index 1fed7df6059..65f7ac711af 100644 --- a/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GlobalActionsPanelPreferenceControllerTest.java @@ -85,4 +85,9 @@ public class GlobalActionsPanelPreferenceControllerTest { new GlobalActionsPanelPreferenceController(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/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index b2ba216830f..b694db38029 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -118,4 +118,9 @@ public class PickupGesturePreferenceControllerTest { new PickupGesturePreferenceController(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/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index dbef598d95b..519232e2898 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -184,4 +184,9 @@ public class SwipeToNotificationPreferenceControllerTest { new SwipeToNotificationPreferenceController(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/gestures/TapScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java index 12715fd8aa1..b1a53ccc042 100644 --- a/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/TapScreenGesturePreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.hardware.display.AmbientDisplayConfiguration; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; @@ -90,4 +89,9 @@ public class TapScreenGesturePreferenceControllerTest { new TapScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN); assertThat(controller.isSliceable()).isTrue(); } + + @Test + public void isPublicSlice_returnTrue() { + assertThat(mController.isPublicSlice()).isTrue(); + } }