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

Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-11 06:27:16 +00:00
committed by Automerger Merge Worker
parent ec0cf19aad 007c215c3e
commit 44431c73e7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -3196,6 +3196,8 @@
<string name="screen_timeout_title">Screen turns off</string>
<!-- Sound & display settings screen, setting option summary to change screen timeout -->
<string name="screen_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> of inactivity</string>
<!-- Sound & display settings screen, setting option summary if there is no matching candidate -->
<string name="screen_timeout_summary_not_set">Not set</string>
<!-- Wallpaper settings title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_title">Wallpaper</string>
<!-- Styles & Wallpapers settings title [CHAR LIMIT=30] -->

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

@@ -27,6 +27,7 @@ import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.annotation.Nullable;
import androidx.preference.Preference;
import com.android.settings.R;
@@ -74,7 +75,9 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
private CharSequence getTimeoutSummary(long maxTimeout) {
final long currentTimeout = getCurrentScreenTimeout();
final CharSequence description = getTimeoutDescription(currentTimeout, maxTimeout);
return mContext.getString(R.string.screen_timeout_summary, description);
return description == null ? mContext.getString(
R.string.screen_timeout_summary_not_set) : mContext.getString(
R.string.screen_timeout_summary, description);
}
private Long getMaxScreenTimeout() {
@@ -112,6 +115,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
}
@Nullable
private CharSequence getTimeoutDescription(long currentTimeout, long maxTimeout) {
if (currentTimeout < 0 || mTimeoutEntries == null || mTimeoutValues == null
|| mTimeoutValues.length != mTimeoutEntries.length) {
@@ -127,6 +131,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
}
}
@Nullable
private CharSequence getCurrentTimeout(long currentTimeout) {
for (int i = 0; i < mTimeoutValues.length; i++) {
if (currentTimeout == Long.parseLong(mTimeoutValues[i].toString())) {
@@ -136,6 +141,7 @@ public class ScreenTimeoutPreferenceController extends BasePreferenceController
return null;
}
@Nullable
private CharSequence getLargestTimeout(long maxTimeout) {
CharSequence largestTimeout = null;
// The list of timeouts is sorted