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

Remove the comma between hour and minutes in app list.

Browse Source 
Bug: 267184192
Fix: 267184192
Test: presubmit
Change-Id: Ic37046218ffe501600d5d247a10d3f091acf131b
This commit is contained in:
Zaiyue Xue
2023-02-03 15:25:05 +08:00
parent 1d45f7f6ed
commit 2b66ff613d
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -639,6 +639,13 @@ public class BatteryUtils {
return DockDefenderMode.DISABLED; return DockDefenderMode.DISABLED;
} }
/** Formats elapsed time without commas in between. */
public static CharSequence formatElapsedTimeWithoutComma(
Context context, double millis, boolean withSeconds, boolean collapseTimeUnit) {
return StringUtil.formatElapsedTime(context, millis, withSeconds, collapseTimeUnit)
.toString().replaceAll(",", "");
}
/** Builds the battery usage time summary. */ /** Builds the battery usage time summary. */
public static String buildBatteryUsageTimeSummary(final Context context, final boolean isSystem, public static String buildBatteryUsageTimeSummary(final Context context, final boolean isSystem,
final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs, final long foregroundUsageTimeInMs, final long backgroundUsageTimeInMs,
@@ -675,7 +682,7 @@ public class BatteryUtils {
if (timeInMs < DateUtils.MINUTE_IN_MILLIS) { if (timeInMs < DateUtils.MINUTE_IN_MILLIS) {
return context.getString(lessThanOneMinuteResId); return context.getString(lessThanOneMinuteResId);
} }
final CharSequence timeSequence = StringUtil.formatElapsedTime( final CharSequence timeSequence = formatElapsedTimeWithoutComma(
context, (double) timeInMs, /*withSeconds=*/ false, /*collapseTimeUnit=*/ false); context, (double) timeInMs, /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
return context.getString(normalResId, timeSequence); return context.getString(normalResId, timeSequence);
} }

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

@@ -28,7 +28,7 @@ import androidx.preference.PreferenceScreen;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.utils.StringUtil; import com.android.settings.fuelgauge.BatteryUtils;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -89,10 +89,10 @@ public class ScreenOnTimeController extends BasePreferenceController {
@VisibleForTesting @VisibleForTesting
void showScreenOnTimeText(Long screenOnTime) { void showScreenOnTimeText(Long screenOnTime) {
final CharSequence timeSequence = final CharSequence timeSequence =
StringUtil.formatElapsedTime(mPrefContext, (double) screenOnTime, BatteryUtils.formatElapsedTimeWithoutComma(mPrefContext, (double) screenOnTime,
/*withSeconds=*/ false, /*collapseTimeUnit=*/ false); /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
mScreenOnTimeTextPreference.setText( mScreenOnTimeTextPreference.setText(
enlargeFontOfNumberIfNeeded(mPrefContext, removeCommas(timeSequence))); enlargeFontOfNumberIfNeeded(mPrefContext, timeSequence));
mScreenOnTimeTextPreference.setVisible(true); mScreenOnTimeTextPreference.setVisible(true);
} }
@@ -115,8 +115,4 @@ public class ScreenOnTimeController extends BasePreferenceController {
} }
return spannableText; return spannableText;
} }
private static CharSequence removeCommas(CharSequence text) {
return text.toString().replaceAll(",", "");
}
} }