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

Merge "fix(brightness suw): Hide brightness preference in the suw." into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-01-21 00:03:42 -08:00
committed by Android (Google) Code Review
parent 6a2da665c5 47550d4c8a
commit d49287f08e
4 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizard.java
View File

@@ -49,12 +49,11 @@ public class AutoBrightnessPreferenceControllerForSetupWizard
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
Preference preference = screen.findPreference(getPreferenceKey());
final Preference preference = screen.findPreference(getPreferenceKey());
if (preference instanceof RestrictedPreferenceHelperProvider helperProvider) {
mRestrictedPreferenceHelper = helperProvider.getRestrictedPreferenceHelper();
preference.setVisible(!isRestricted());
}
super.displayPreference(screen);
}
@Override
@@ -70,4 +69,4 @@ public class AutoBrightnessPreferenceControllerForSetupWizard
public CharSequence getSummary() {
return "";
}
}
}

7
src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizard.java
View File

@@ -52,12 +52,11 @@ public class BrightnessLevelPreferenceControllerForSetupWizard extends
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
Preference preference = screen.findPreference(getPreferenceKey());
final Preference preference = screen.findPreference(getPreferenceKey());
if (preference instanceof RestrictedPreferenceHelperProvider helperProvider) {
mRestrictedPreferenceHelper = helperProvider.getRestrictedPreferenceHelper();
preference.setVisible(!isRestricted());
}
super.displayPreference(screen);
}
@Override
@@ -68,4 +67,4 @@ public class BrightnessLevelPreferenceControllerForSetupWizard extends
}
return super.getAvailabilityStatus();
}
}
}

16
tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerForSetupWizardTest.java
View File

@@ -77,6 +77,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
public void displayPreference_flagOn_preferenceVisibleTrue() {
Preference preference =
displayPreference(/* configAvailable= */ true, /* restricted= */ false);
assertThat(preference.isVisible()).isTrue();
}
@@ -85,6 +86,16 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
public void displayPreference_flagOnAndRestricted_preferenceVisibleFalse() {
Preference preference =
displayPreference(/* configAvailable= */ true, /* restricted= */ true);
assertThat(preference.isVisible()).isFalse();
}
@Test
@DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void displayPreference_flagOff_preferenceVisibleFalse() {
Preference preference =
displayPreference(/* configAvailable= */ true, /* restricted= */ false);
assertThat(preference.isVisible()).isFalse();
}
@@ -92,6 +103,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_configTrueAndFlagOn_availableUnsearchable() {
displayPreference(/* configAvailable= */ true, /* restricted= */ false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@@ -99,6 +111,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_configTrueAndFlagOnAndRestricted_conditionallyUnavailable() {
displayPreference(/* configAvailable= */ true, /* restricted= */ true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@@ -106,6 +119,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_configFalseAndFlagOn_unsupportedOnDevice() {
displayPreference(/* configAvailable= */ false, /* restricted= */ false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@@ -113,6 +127,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_configFalseAndFlagOnAndRestricted_conditionallyUnavailable() {
displayPreference(/* configAvailable= */ false, /* restricted= */ true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@@ -120,6 +135,7 @@ public class AutoBrightnessPreferenceControllerForSetupWizardTest {
@DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_flagOff_conditionallyUnavailable() {
displayPreference(/* configAvailable= */ true, /* restricted= */ false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}

13
tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerForSetupWizardTest.java
View File

@@ -68,6 +68,7 @@ public class BrightnessLevelPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void displayPreference_flagOn_preferenceVisibleTrue() {
Preference preference = displayPreference(/* restricted= */ false);
assertThat(preference.isVisible()).isTrue();
}
@@ -75,6 +76,15 @@ public class BrightnessLevelPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void displayPreference_flagOnAndRestricted_preferenceVisibleFalse() {
Preference preference = displayPreference(/* restricted= */ true);
assertThat(preference.isVisible()).isFalse();
}
@Test
@DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void displayPreference_flagOff_preferenceVisibleFalse() {
Preference preference = displayPreference(/* restricted= */ false);
assertThat(preference.isVisible()).isFalse();
}
@@ -82,6 +92,7 @@ public class BrightnessLevelPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_flagOn_available() {
displayPreference(/* restricted= */ false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@@ -89,6 +100,7 @@ public class BrightnessLevelPreferenceControllerForSetupWizardTest {
@EnableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_flagOnAndRestricted_conditionallyUnavailable() {
displayPreference(/* restricted= */ true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@@ -96,6 +108,7 @@ public class BrightnessLevelPreferenceControllerForSetupWizardTest {
@DisableFlags(Flags.FLAG_ADD_BRIGHTNESS_SETTINGS_IN_SUW)
public void getAvailabilityStatus_flagOff_conditionallyUnavailable() {
displayPreference(/* restricted= */ false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}