Make some gesture 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: I0b54e752c5982f13193590db47dc3a84dde5311d
This commit is contained in:
@@ -60,6 +60,11 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
|
|||||||
return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
|
return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_power");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getVideoPrefKey() {
|
protected String getVideoPrefKey() {
|
||||||
return PREF_KEY_VIDEO;
|
return PREF_KEY_VIDEO;
|
||||||
|
@@ -77,6 +77,11 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
|
|||||||
return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_screen");
|
return TextUtils.equals(getPreferenceKey(), "gesture_double_tap_screen");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
|
return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
|
||||||
|
@@ -77,6 +77,11 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
|
|||||||
return TextUtils.equals(getPreferenceKey(), "gesture_double_twist");
|
return TextUtils.equals(getPreferenceKey(), "gesture_double_twist");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getVideoPrefKey() {
|
protected String getVideoPrefKey() {
|
||||||
return PREF_KEY_VIDEO;
|
return PREF_KEY_VIDEO;
|
||||||
|
@@ -60,6 +60,11 @@ public class GlobalActionsPanelPreferenceController extends GesturePreferenceCon
|
|||||||
return TextUtils.equals(getPreferenceKey(), TOGGLE_KEY);
|
return TextUtils.equals(getPreferenceKey(), TOGGLE_KEY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isChecked() {
|
public boolean isChecked() {
|
||||||
int enabled = Settings.Secure.getInt(mContext.getContentResolver(), ENABLED_SETTING, 0);
|
int enabled = Settings.Secure.getInt(mContext.getContentResolver(), ENABLED_SETTING, 0);
|
||||||
|
@@ -72,6 +72,11 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
|
|||||||
return TextUtils.equals(getPreferenceKey(), "gesture_pick_up");
|
return TextUtils.equals(getPreferenceKey(), "gesture_pick_up");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getVideoPrefKey() {
|
protected String getVideoPrefKey() {
|
||||||
return PREF_KEY_VIDEO;
|
return PREF_KEY_VIDEO;
|
||||||
|
@@ -65,6 +65,11 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
|
|||||||
return TextUtils.equals(getPreferenceKey(), "gesture_swipe_down_fingerprint");
|
return TextUtils.equals(getPreferenceKey(), "gesture_swipe_down_fingerprint");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean setChecked(boolean isChecked) {
|
public boolean setChecked(boolean isChecked) {
|
||||||
setSwipeToNotification(mContext, isChecked);
|
setSwipeToNotification(mContext, isChecked);
|
||||||
|
@@ -23,7 +23,6 @@ import android.content.Context;
|
|||||||
import android.hardware.display.AmbientDisplayConfiguration;
|
import android.hardware.display.AmbientDisplayConfiguration;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.text.TextUtils;
|
|
||||||
|
|
||||||
public class TapScreenGesturePreferenceController extends GesturePreferenceController {
|
public class TapScreenGesturePreferenceController extends GesturePreferenceController {
|
||||||
|
|
||||||
@@ -54,7 +53,7 @@ public class TapScreenGesturePreferenceController extends GesturePreferenceContr
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isSliceable() {
|
public boolean isPublicSlice() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -140,4 +140,9 @@ public class DoubleTapPowerPreferenceControllerTest {
|
|||||||
new DoubleTapPowerPreferenceController(mContext, "bad_key");
|
new DoubleTapPowerPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -129,4 +129,9 @@ public class DoubleTapScreenPreferenceControllerTest {
|
|||||||
new DoubleTapScreenPreferenceController(mContext, "bad_key");
|
new DoubleTapScreenPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -170,4 +170,9 @@ public class DoubleTwistPreferenceControllerTest {
|
|||||||
new DoubleTwistPreferenceController(mContext, "bad_key");
|
new DoubleTwistPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -85,4 +85,9 @@ public class GlobalActionsPanelPreferenceControllerTest {
|
|||||||
new GlobalActionsPanelPreferenceController(mContext, "bad_key");
|
new GlobalActionsPanelPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -118,4 +118,9 @@ public class PickupGesturePreferenceControllerTest {
|
|||||||
new PickupGesturePreferenceController(mContext, "bad_key");
|
new PickupGesturePreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -184,4 +184,9 @@ public class SwipeToNotificationPreferenceControllerTest {
|
|||||||
new SwipeToNotificationPreferenceController(mContext, "bad_key");
|
new SwipeToNotificationPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -30,7 +30,6 @@ import android.hardware.display.AmbientDisplayConfiguration;
|
|||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Answers;
|
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
import org.robolectric.RobolectricTestRunner;
|
import org.robolectric.RobolectricTestRunner;
|
||||||
@@ -90,4 +89,9 @@ public class TapScreenGesturePreferenceControllerTest {
|
|||||||
new TapScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN);
|
new TapScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN);
|
||||||
assertThat(controller.isSliceable()).isTrue();
|
assertThat(controller.isSliceable()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user