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

Allow OEM customizing max screen timeout value.

Browse Source 
Side fix - update string for select timezone.

Change-Id: Id61128b7dfcc27da8ed07225af3b6bec4e93b512
Fixes: 113346164
Fixes: 121986474
Test: robotest
This commit is contained in:
Fan Zhang
2019-01-07 16:41:10 -08:00
parent 6498d8f621
commit f57f490aa6
7 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java
View File

@@ -17,11 +17,11 @@ package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.robolectric.RuntimeEnvironment.application;
import android.util.AttributeSet;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.RestrictedLockUtils;
@@ -69,4 +69,23 @@ public class TimeoutListPreferenceTest {
// should set to largest allowed value, which is 5 minute
assertThat(mPreference.getValue()).isEqualTo("300000");
}
@Test
@Config(qualifiers = "mcc999")
public void newInstance_hasLowTimeoutConfig_shouldRemoveLongTimeouts() {
final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
final TimeoutListPreference pref = new TimeoutListPreference(application, attributeSet);
final long maxTimeout = application.getResources().getInteger(
R.integer.max_lock_after_timeout_ms);
pref.setEntries(R.array.screen_timeout_entries);
pref.setEntryValues(R.array.screen_timeout_values);
pref.updateInitialValues();
final CharSequence[] values = pref.getEntryValues();
for (CharSequence value : values) {
long timeout = Long.parseLong(value.toString());
assertThat(timeout).isAtMost(maxTimeout);
}
}
}