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

New approach to override timeout max value

Browse Source 
- Revert "Allow OEM customizing max screen timeout value."
- Use separate timeout list for screen timeout and lock timeout.

This reverts commit f57f490aa6.

Fixes: 113346164
Test: manual

Change-Id: Ifbb054c232c47455ae82e3ed817f9c1e96f694cf
This commit is contained in:
Fan Zhang
2019-01-15 18:52:25 +00:00
parent 3eac2faa9c
commit 69e4302d40
7 changed files with 25 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/display/TimeoutPreferenceController.java
View File

@@ -13,6 +13,8 @@
*/
package com.android.settings.display;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.UserHandle;
@@ -58,7 +60,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
public void updateState(Preference preference) {
final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference;
final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
Settings.System.SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
timeoutListPreference.setValue(String.valueOf(currentTimeout));
final DevicePolicyManager dpm =
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
@@ -84,8 +86,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
public boolean onPreferenceChange(Preference preference, Object newValue) {
try {
int value = Integer.parseInt((String) newValue);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.SCREEN_OFF_TIMEOUT, value);
Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
updateTimeoutPreferenceDescription((TimeoutListPreference) preference, value);
} catch (NumberFormatException e) {
Log.e(TAG, "could not persist screen timeout setting", e);
@@ -93,7 +94,7 @@ public class TimeoutPreferenceController extends AbstractPreferenceController im
return true;
}
private static CharSequence getTimeoutDescription(
public static CharSequence getTimeoutDescription(
long currentTimeout, CharSequence[] entries, CharSequence[] values) {
if (currentTimeout < 0 || entries == null || values == null
|| values.length != entries.length) {