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

58
src/com/android/settings/display/TimeoutListPreference.java
View File

@@ -26,6 +26,7 @@ import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog.Builder;
import com.android.settings.R;
@@ -33,18 +34,18 @@ import com.android.settings.RestrictedListPreference;
import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
import java.util.List;
public class TimeoutListPreference extends RestrictedListPreference {
private static final String TAG = "TimeoutListPreference";
private EnforcedAdmin mAdmin;
private final CharSequence[] mInitialEntries;
private final CharSequence[] mInitialValues;
private CharSequence[] mInitialEntries;
private CharSequence[] mInitialValues;
public TimeoutListPreference(Context context, AttributeSet attrs) {
super(context, attrs);
mInitialEntries = getEntries();
mInitialValues = getEntryValues();
updateInitialValues();
}
@Override
@@ -65,13 +66,8 @@ public class TimeoutListPreference extends RestrictedListPreference {
if (mAdmin != null) {
View footerView = dialog.findViewById(R.id.admin_disabled_other_options);
footerView.findViewById(R.id.admin_more_details_link).setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View view) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
getContext(), mAdmin);
}
});
view -> RestrictedLockUtils.sendShowAdminSupportDetailsIntent(
getContext(), mAdmin));
}
}
@@ -89,8 +85,8 @@ public class TimeoutListPreference extends RestrictedListPreference {
maxTimeout = Long.MAX_VALUE;
}
ArrayList<CharSequence> revisedEntries = new ArrayList<CharSequence>();
ArrayList<CharSequence> revisedValues = new ArrayList<CharSequence>();
final ArrayList<CharSequence> revisedEntries = new ArrayList<>();
final ArrayList<CharSequence> revisedValues = new ArrayList<>();
for (int i = 0; i < mInitialValues.length; ++i) {
long timeout = Long.parseLong(mInitialValues[i].toString());
if (timeout <= maxTimeout) {
@@ -101,7 +97,7 @@ public class TimeoutListPreference extends RestrictedListPreference {
// If there are no possible options for the user, then set this preference as disabled
// by admin, otherwise remove the padlock in case it was set earlier.
if (revisedValues.size() == 0) {
if (revisedValues.isEmpty()) {
setDisabledByAdmin(admin);
return;
} else {
@@ -117,7 +113,7 @@ public class TimeoutListPreference extends RestrictedListPreference {
setValue(String.valueOf(userPreference));
} else if (revisedValues.size() > 0
&& Long.parseLong(revisedValues.get(revisedValues.size() - 1).toString())
== maxTimeout) {
== maxTimeout) {
// If the last one happens to be the same as the max timeout, select that
setValue(String.valueOf(maxTimeout));
} else {
@@ -128,4 +124,36 @@ public class TimeoutListPreference extends RestrictedListPreference {
}
}
}
@VisibleForTesting
void updateInitialValues() {
// Read default list of candidate values.
final CharSequence[] entries = getEntries();
final CharSequence[] values = getEntryValues();
// Filter out values based on config
final List<CharSequence> revisedEntries = new ArrayList<>();
final List<CharSequence> revisedValues = new ArrayList<>();
final long maxTimeout = getContext().getResources().getInteger(
R.integer.max_lock_after_timeout_ms);
if (entries == null || values == null) {
return;
}
Log.d(TAG, "max timeout: " + maxTimeout);
for (int i = 0; i < values.length; ++i) {
long timeout = Long.parseLong(values[i].toString());
if (timeout <= maxTimeout) {
Log.d(TAG, "keeping timeout: " + values[i]);
revisedEntries.add(entries[i]);
revisedValues.add(values[i]);
} else {
Log.d(TAG, "Dropping timeout: " + values[i]);
}
}
// Store final candidates in initial value lists.
mInitialEntries = revisedEntries.toArray(new CharSequence[0]);
setEntries(mInitialEntries);
mInitialValues = revisedValues.toArray(new CharSequence[0]);
setEntryValues(mInitialValues);
}
}