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

Removes TimeoutPreferenceController in Settings.

Browse Source 
Test: unit tests
Bug: 173450342
Change-Id: I16470192fc41afe83cf601baa79fea360e8dc1d1
This commit is contained in:
Yi Jiang
2020-12-15 16:13:54 -08:00
parent 268a8e2495
commit 1a5e735773
3 changed files with 17 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/display/ScreenTimeoutPreferenceController.java
View File

@@ -65,7 +65,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
R.array.screen_timeout_entries);
final CharSequence[] timeoutValues = mContext.getResources().getStringArray(
R.array.screen_timeout_values);
final CharSequence description = TimeoutPreferenceController.getTimeoutDescription(
final CharSequence description = getTimeoutDescription(
currentTimeout, timeoutEntries, timeoutValues);
return mContext.getString(R.string.screen_timeout_summary, description);
}
@@ -84,4 +84,20 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
return Settings.System.getLong(mContext.getContentResolver(),
SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
}
private static CharSequence getTimeoutDescription(
long currentTimeout, CharSequence[] entries, CharSequence[] values) {
if (currentTimeout < 0 || entries == null || values == null
|| values.length != entries.length) {
return null;
}
for (int i = 0; i < values.length; i++) {
long timeout = Long.parseLong(values[i].toString());
if (currentTimeout == timeout) {
return entries[i];
}
}
return null;
}
}