Make some display 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: I2a36da4ac4bb14a4d2ac7b89ab2bb3ebf8e655f7
This commit is contained in:
@@ -36,7 +36,7 @@ public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPrefer
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isSliceable() {
|
public boolean isPublicSlice() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -55,6 +55,11 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
|
|||||||
return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
|
return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isChecked() {
|
public boolean isChecked() {
|
||||||
return getConfig().alwaysOnEnabled(MY_USER);
|
return getConfig().alwaysOnEnabled(MY_USER);
|
||||||
|
@@ -88,6 +88,11 @@ public class AmbientDisplayNotificationsPreferenceController extends
|
|||||||
return TextUtils.equals(getPreferenceKey(), "ambient_display_notification");
|
return TextUtils.equals(getPreferenceKey(), "ambient_display_notification");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private AmbientDisplayConfiguration getAmbientConfig() {
|
private AmbientDisplayConfiguration getAmbientConfig() {
|
||||||
if (mConfig == null) {
|
if (mConfig == null) {
|
||||||
mConfig = new AmbientDisplayConfiguration(mContext);
|
mConfig = new AmbientDisplayConfiguration(mContext);
|
||||||
|
@@ -33,7 +33,7 @@ public class AutoBrightnessDetailPreferenceController extends AutoBrightnessPref
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isSliceable() {
|
public boolean isPublicSlice() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -81,6 +81,11 @@ public class AutoRotatePreferenceController extends TogglePreferenceController i
|
|||||||
return TextUtils.equals(getPreferenceKey(), "auto_rotate");
|
return TextUtils.equals(getPreferenceKey(), "auto_rotate");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isChecked() {
|
public boolean isChecked() {
|
||||||
return !RotationPolicy.isRotationLocked(mContext);
|
return !RotationPolicy.isRotationLocked(mContext);
|
||||||
|
@@ -63,6 +63,11 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
|
|||||||
return TextUtils.equals(getPreferenceKey(), "night_display_activated");
|
return TextUtils.equals(getPreferenceKey(), "night_display_activated");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void displayPreference(PreferenceScreen screen) {
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
super.displayPreference(screen);
|
super.displayPreference(screen);
|
||||||
|
@@ -50,6 +50,11 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
|
|||||||
return TextUtils.equals(getPreferenceKey(), "night_display_temperature");
|
return TextUtils.equals(getPreferenceKey(), "night_display_temperature");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPublicSlice() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void displayPreference(PreferenceScreen screen) {
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
super.displayPreference(screen);
|
super.displayPreference(screen);
|
||||||
|
@@ -61,6 +61,11 @@ public class AdaptiveSleepDetailPreferenceControllerTest {
|
|||||||
assertThat(mController.isSliceable()).isTrue();
|
assertThat(mController.isSliceable()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getAvailabilityStatus_configTrueSet_shouldReturnAvailable() {
|
public void getAvailabilityStatus_configTrueSet_shouldReturnAvailable() {
|
||||||
SettingsShadowResources.overrideResource(R.bool.config_adaptive_sleep_available, true);
|
SettingsShadowResources.overrideResource(R.bool.config_adaptive_sleep_available, true);
|
||||||
|
@@ -133,10 +133,10 @@ public class AdaptiveSleepPreferenceControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void isSliceable_returnsFalse() {
|
public void isSliceable_returnsTrue() {
|
||||||
final AdaptiveSleepPreferenceController controller =
|
final AdaptiveSleepPreferenceController controller =
|
||||||
new AdaptiveSleepPreferenceController(mContext, "any_key");
|
new AdaptiveSleepPreferenceController(mContext, "any_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@@ -128,4 +128,9 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest {
|
|||||||
new AmbientDisplayAlwaysOnPreferenceController(mContext, "bad_key");
|
new AmbientDisplayAlwaysOnPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -171,4 +171,9 @@ public class AmbientDisplayNotificationsPreferenceControllerTest {
|
|||||||
new AmbientDisplayNotificationsPreferenceController(mContext, "bad_key");
|
new AmbientDisplayNotificationsPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -51,6 +51,11 @@ public class AutoBrightnessDetailPreferenceControllerTest {
|
|||||||
assertThat(mController.isSliceable()).isTrue();
|
assertThat(mController.isSliceable()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getAvailabilityStatus_configTrueSet_shouldReturnAvailable() {
|
public void getAvailabilityStatus_configTrueSet_shouldReturnAvailable() {
|
||||||
SettingsShadowResources.overrideResource(
|
SettingsShadowResources.overrideResource(
|
||||||
|
@@ -35,7 +35,6 @@ import com.android.settings.core.BasePreferenceController;
|
|||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
import com.android.settings.testutils.shadow.ShadowRotationPolicy;
|
import com.android.settings.testutils.shadow.ShadowRotationPolicy;
|
||||||
|
|
||||||
import org.junit.After;
|
|
||||||
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;
|
||||||
@@ -153,6 +152,11 @@ public class AutoRotatePreferenceControllerTest {
|
|||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
private void enableAutoRotationPreference() {
|
private void enableAutoRotationPreference() {
|
||||||
when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
|
when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
|
||||||
when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
|
when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
|
||||||
|
@@ -15,6 +15,7 @@
|
|||||||
package com.android.settings.display;
|
package com.android.settings.display;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
@@ -83,7 +84,7 @@ public class NightDisplayActivationPreferenceControllerTest {
|
|||||||
@Test
|
@Test
|
||||||
public void isSliceableCorrectKey_returnsTrue() {
|
public void isSliceableCorrectKey_returnsTrue() {
|
||||||
final NightDisplayActivationPreferenceController controller =
|
final NightDisplayActivationPreferenceController controller =
|
||||||
new NightDisplayActivationPreferenceController(mContext,"night_display_activated");
|
new NightDisplayActivationPreferenceController(mContext, "night_display_activated");
|
||||||
assertThat(controller.isSliceable()).isTrue();
|
assertThat(controller.isSliceable()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,6 +95,11 @@ public class NightDisplayActivationPreferenceControllerTest {
|
|||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mPreferenceController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onClick_activates() {
|
public void onClick_activates() {
|
||||||
mColorDisplayManager.setNightDisplayActivated(false);
|
mColorDisplayManager.setNightDisplayActivated(false);
|
||||||
|
@@ -19,7 +19,9 @@ import static com.google.common.truth.Truth.assertThat;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.hardware.display.ColorDisplayManager;
|
import android.hardware.display.ColorDisplayManager;
|
||||||
import android.provider.Settings.Secure;
|
import android.provider.Settings.Secure;
|
||||||
|
|
||||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
@@ -80,7 +82,8 @@ public class NightDisplayIntensityPreferenceControllerTest {
|
|||||||
mPreferenceController.onPreferenceChange(null, 20);
|
mPreferenceController.onPreferenceChange(null, 20);
|
||||||
|
|
||||||
assertThat(
|
assertThat(
|
||||||
mContext.getSystemService(ColorDisplayManager.class).getNightDisplayColorTemperature())
|
mContext.getSystemService(
|
||||||
|
ColorDisplayManager.class).getNightDisplayColorTemperature())
|
||||||
.isEqualTo(3030);
|
.isEqualTo(3030);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,4 +114,9 @@ public class NightDisplayIntensityPreferenceControllerTest {
|
|||||||
new NightDisplayIntensityPreferenceController(mContext, "bad_key");
|
new NightDisplayIntensityPreferenceController(mContext, "bad_key");
|
||||||
assertThat(controller.isSliceable()).isFalse();
|
assertThat(controller.isSliceable()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isPublicSlice_returnTrue() {
|
||||||
|
assertThat(mPreferenceController.isPublicSlice()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user