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

Merge "Follow footer preference guildance on some pages" into sc-dev am: 0dae5d005f

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

Change-Id: Icba1862d5d5eb3ab8367b490d1892dc932ddf5c8
This commit is contained in:
Tsung-Mao Fang
2021-03-29 09:43:01 +00:00
committed by Automerger Merge Worker
parent d8556c43e7 0dae5d005f
commit 3e8f738828
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/display/AdaptiveSleepPreferenceController.java
View File

@@ -60,7 +60,6 @@ public class AdaptiveSleepPreferenceController {
mPreference = new RestrictedSwitchPreference(context);
mPreference.setTitle(R.string.adaptive_sleep_title);
mPreference.setSummary(R.string.adaptive_sleep_description);
mPreference.setIcon(R.drawable.empty_icon);
mPreference.setChecked(isChecked());
mPreference.setKey(PREFERENCE_KEY);
mPreference.setOnPreferenceClickListener(preference -> {

5
src/com/android/settings/display/ScreenTimeoutSettings.java
View File

@@ -164,7 +164,8 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
final String textMoreDetails = getResources().getString(R.string.admin_more_details);
final SpannableString spannableString = new SpannableString(
textDisabledByAdmin + System.lineSeparator() + textMoreDetails);
textDisabledByAdmin + System.lineSeparator()
+ System.lineSeparator() + textMoreDetails);
final ClickableSpan clickableSpan = new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -174,7 +175,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
if (textDisabledByAdmin != null && textMoreDetails != null) {
spannableString.setSpan(clickableSpan, textDisabledByAdmin.length() + 1,
textDisabledByAdmin.length() + textMoreDetails.length() + 1,
textDisabledByAdmin.length() + textMoreDetails.length() + 2,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}