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

Merge "[Expressive Battery] Update screen on time text preference style." into main

Browse Source
This commit is contained in:
YK Hung
2025-02-06 01:07:40 -08:00
committed by Android (Google) Code Review
parent fb4be96958 45ac3f280d
commit 436cce3aaf
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java
View File

@@ -30,6 +30,7 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.widget.SettingsThemeHelper;
import java.util.Locale;
import java.util.regex.Matcher;
@@ -119,10 +120,11 @@ public class ScreenOnTimeController extends BasePreferenceController {
}
final SpannableString spannableText = new SpannableString(text);
final int enlargeFontSizeDp = SettingsThemeHelper.isExpressiveTheme(context) ? 64 : 36;
final Matcher matcher = NUMBER_PATTERN.matcher(text);
while (matcher.find()) {
spannableText.setSpan(
new AbsoluteSizeSpan(36, true /* dip */),
new AbsoluteSizeSpan(enlargeFontSizeDp, true /* dip */),
matcher.start(),
matcher.end(),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

3
src/com/android/settings/fuelgauge/batteryusage/TextViewPreference.java
View File

@@ -25,9 +25,10 @@ import androidx.preference.PreferenceViewHolder;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settingslib.widget.GroupSectionDividerMixin;
/** A preference for a single text view. */
public class TextViewPreference extends Preference {
public class TextViewPreference extends Preference implements GroupSectionDividerMixin {
private static final String TAG = "TextViewPreference";
@VisibleForTesting CharSequence mText;