PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ColorDisplayManager

Browse Source 
Bug: 111215474
Test: make RunSettingsRoboTests -j100
Change-Id: I78bb44a1c4824f2b5223ca0d58ad224b96591d9a
This commit is contained in:
Christine Franks
2018-07-03 14:44:08 -07:00
parent 92792ee806
commit 26d0595373
9 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/display/NightDisplayActivationPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
@@ -53,7 +54,8 @@ public class NightDisplayActivationPreferenceController extends TogglePreference
@Override
public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override

5
src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -39,7 +41,8 @@ public class NightDisplayAutoModePreferenceController extends BasePreferenceCont
@Override
public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override

5
src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
View File

@@ -20,6 +20,8 @@ import android.content.Context;
import androidx.preference.Preference;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
@@ -37,7 +39,8 @@ public class NightDisplayCustomEndTimePreferenceController extends BasePreferenc
@Override
public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override

5
src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
View File

@@ -20,6 +20,8 @@ import android.content.Context;
import androidx.preference.Preference;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
@@ -37,7 +39,8 @@ public class NightDisplayCustomStartTimePreferenceController extends BasePrefere
@Override
public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override

6
src/com/android/settings/display/NightDisplayFooterPreferenceController.java
View File

@@ -20,7 +20,8 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import android.hardware.display.ColorDisplayManager;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.FooterPreference;
@@ -33,7 +34,8 @@ public class NightDisplayFooterPreferenceController extends BasePreferenceContro
@Override
public int getAvailabilityStatus() {
return ColorDisplayController.isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return ColorDisplayManager.isNightDisplayAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
@Override

3
src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.text.TextUtils;
import androidx.preference.Preference;
@@ -37,7 +38,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
@Override
public int getAvailabilityStatus() {
if (!ColorDisplayController.isAvailable(mContext)) {
if (!ColorDisplayManager.isNightDisplayAvailable(mContext)) {
return UNSUPPORTED_ON_DEVICE;
} else if (!mController.isActivated()) {
return DISABLED_DEPENDENT_SETTING;

3
src/com/android/settings/display/NightDisplayPreferenceController.java
View File

@@ -15,6 +15,7 @@ package com.android.settings.display;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -42,7 +43,7 @@ public class NightDisplayPreferenceController extends AbstractPreferenceControll
@Override
public boolean isAvailable() {
return ColorDisplayController.isAvailable(mContext);
return ColorDisplayManager.isNightDisplayAvailable(mContext);
}
@Override

5
src/com/android/settings/display/NightDisplaySettings.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.display;
import android.app.Dialog;
import android.app.TimePickerDialog;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
@@ -178,7 +179,7 @@ public class NightDisplaySettings extends DashboardFragment
return buildPreferenceControllers(context);
}
private static List <AbstractPreferenceController> buildPreferenceControllers(Context context) {
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(1);
controllers.add(new NightDisplayFooterPreferenceController(context));
return controllers;
@@ -198,7 +199,7 @@ public class NightDisplaySettings extends DashboardFragment
@Override
protected boolean isPageSearchEnabled(Context context) {
return ColorDisplayController.isAvailable(context);
return ColorDisplayManager.isNightDisplayAvailable(context);
}
@Override

28
tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
View File

@@ -3,17 +3,14 @@ package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import android.app.Application;
import android.content.ComponentName;
import android.provider.Settings.Secure;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.Settings.NightDisplaySuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
@@ -25,16 +22,8 @@ import org.robolectric.annotation.Config;
})
public class NightDisplayPreferenceControllerTest {
private NightDisplayPreferenceController mPreferenceController;
@Before
public void setUp() {
mPreferenceController = new NightDisplayPreferenceController(RuntimeEnvironment.application);
}
@After
public void tearDown() {
mPreferenceController = null;
SettingsShadowResources.reset();
}
@@ -43,9 +32,7 @@ public class NightDisplayPreferenceControllerTest {
final Application context = RuntimeEnvironment.application;
Secure.putInt(context.getContentResolver(),
Secure.NIGHT_DISPLAY_AUTO_MODE, ColorDisplayController.AUTO_MODE_DISABLED);
final ComponentName componentName =
new ComponentName(context, NightDisplaySuggestionActivity.class);
assertThat(mPreferenceController.isSuggestionComplete(context)).isFalse();
assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isFalse();
}
@Test
@@ -53,9 +40,7 @@ public class NightDisplayPreferenceControllerTest {
final Application context = RuntimeEnvironment.application;
Secure.putInt(context.getContentResolver(),
Secure.NIGHT_DISPLAY_AUTO_MODE, ColorDisplayController.AUTO_MODE_CUSTOM);
final ComponentName componentName =
new ComponentName(context, NightDisplaySuggestionActivity.class);
assertThat(mPreferenceController.isSuggestionComplete(context)).isTrue();
assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
}
@Test
@@ -63,9 +48,7 @@ public class NightDisplayPreferenceControllerTest {
final Application context = RuntimeEnvironment.application;
Secure.putInt(context.getContentResolver(),
Secure.NIGHT_DISPLAY_AUTO_MODE, ColorDisplayController.AUTO_MODE_TWILIGHT);
final ComponentName componentName =
new ComponentName(context, NightDisplaySuggestionActivity.class);
assertThat(mPreferenceController.isSuggestionComplete(context)).isTrue();
assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
}
@Test
@@ -74,9 +57,6 @@ public class NightDisplayPreferenceControllerTest {
Secure.putInt(context.getContentResolver(),
Secure.NIGHT_DISPLAY_AUTO_MODE, ColorDisplayController.AUTO_MODE_DISABLED);
SettingsShadowResources.overrideResource(R.bool.config_night_light_suggestion_enabled, false);
final ComponentName componentName =
new ComponentName(context, NightDisplaySuggestionActivity.class);
assertThat(mPreferenceController.isSuggestionComplete(context)).isTrue();
assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
}
}