Merge "Fix b/265364490: [UX] [Battery usage] Remove comma between hour and min for screen time"

src/com/android/settings/fuelgauge/batteryusage/ScreenOnTimeController.java

@@ -89,7 +89,7 @@ public class ScreenOnTimeController extends BasePreferenceController {
         final CharSequence timeSequence =
                 StringUtil.formatElapsedTime(mPrefContext, (double) screenOnTime,
                         /*withSeconds=*/ false, /*collapseTimeUnit=*/ false);
-        mScreenOnTimeTextPreference.setText(enlargeFontOfNumber(timeSequence));
+        mScreenOnTimeTextPreference.setText(enlargeFontOfNumber(removeCommas(timeSequence)));
         mScreenOnTimeTextPreference.setVisible(true);
     }
 
@@ -107,4 +107,8 @@ public class ScreenOnTimeController extends BasePreferenceController {
         }
         return spannableText;
     }
+
+    private static CharSequence removeCommas(CharSequence text) {
+        return text.toString().replaceAll(",", "");
+    }
 }