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

Update AmbientDisplayAlwaysOnPrefTest to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: Ifdd4db51e87fd38defef23946811b5e24e6c7cfe
This commit is contained in:
jeffreyhuang
2017-11-28 13:41:02 -08:00
parent 6a68f306d7
commit f279ba3f72
2 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
View File

@@ -21,6 +21,7 @@ import android.os.UserHandle;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
@@ -81,7 +82,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends
@Override
public boolean isAvailable() {
return isAvailable(mConfig);
return alwaysOnAvailableForUser(mConfig);
}
public static boolean isAvailable(AmbientDisplayConfiguration config) {
@@ -102,4 +103,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends
ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
ON /* defaultValue */);
}
@VisibleForTesting
boolean alwaysOnAvailableForUser(AmbientDisplayConfiguration config) {
return isAvailable(config);
}
}