Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d623553 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Android (Google) Code Review
Browse files

Merge "AOD setting availability depends on other user settings" into oc-dr1-dev

parents 0782535d f3fc6359

src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro 


    @Override

    public boolean isAvailable() {

        return mConfig.alwaysOnAvailable();

        return mConfig.alwaysOnAvailableForUser(MY_USER);

    }



    @Override

tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ public class AmbientDisplayConfiguration { 
        return true;

    }



    public boolean alwaysOnAvailableForUser(int user) {

        return true;

    }



    public boolean available() {

        return true;

    }

tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { 


    @Test

    public void isAvailable_available() throws Exception {

        when(mConfig.alwaysOnAvailable())

        when(mConfig.alwaysOnAvailableForUser(anyInt()))

                .thenReturn(true);



        assertThat(mController.isAvailable()).isTrue();
@@ -113,7 +113,7 @@ public class AmbientDisplayAlwaysOnPreferenceControllerTest { 


    @Test

    public void isAvailable_unavailable() throws Exception {

        when(mConfig.alwaysOnAvailable())

        when(mConfig.alwaysOnAvailableForUser(anyInt()))

                .thenReturn(false);



        assertThat(mController.isAvailable()).isFalse();