| commit | 6d62355313d7ce92f1ee79b91c6c6643e466e14b | [log] [tgz] |
|---|---|---|
| author | Geoffrey Pitsch <gpitsch@google.com> | Tue Aug 01 14:00:18 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 01 14:00:18 2017 +0000 |
| tree | c641e6ee16a0db4b383380b04c9e9a83fcd8b75f | |
| parent | 0782535daf98eb6e42baea54637e225232e4a2f2 [diff] | |
| parent | f3fc635947d969f0b2e52c4f6f6983af4220d176 [diff] |
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java index 03bcc72..160786f 100644 --- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -75,7 +75,7 @@ @Override public boolean isAvailable() { - return mConfig.alwaysOnAvailable(); + return mConfig.alwaysOnAvailableForUser(MY_USER); } @Override
diff --git a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java index 59ca483..3dcf6ab 100644 --- a/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java +++ b/tests/robotests/src/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -62,6 +62,10 @@ return true; } + public boolean alwaysOnAvailableForUser(int user) { + return true; + } + public boolean available() { return true; }
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 3f3f4b5..3869807 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -105,7 +105,7 @@ @Test public void isAvailable_available() throws Exception { - when(mConfig.alwaysOnAvailable()) + when(mConfig.alwaysOnAvailableForUser(anyInt())) .thenReturn(true); assertThat(mController.isAvailable()).isTrue(); @@ -113,7 +113,7 @@ @Test public void isAvailable_unavailable() throws Exception { - when(mConfig.alwaysOnAvailable()) + when(mConfig.alwaysOnAvailableForUser(anyInt())) .thenReturn(false); assertThat(mController.isAvailable()).isFalse();