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

Merge changes I88978ab8,I07137c92,Ifdd4db51

Browse Source 
* changes:
  Move display test package to sdk 26
  Update AppGridViewTest to sdk 26
  Update AmbientDisplayAlwaysOnPrefTest to sdk 26
This commit is contained in:
TreeHugger Robot
2017-11-29 00:09:31 +00:00
committed by Android (Google) Code Review
parent ed3c6e5787 adc9d7fb4e
commit c2d84d8d2f
14 changed files with 74 additions and 35 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);
}
}