summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-11-16 14:16:00 +0100
committerŁukasz Paczos <lukas.paczos@gmail.com>2018-11-16 14:16:00 +0100
commit75c0d5f3b5ca8681db860991ccb9ae77fe682391 (patch)
tree6a7e46961065293a3c77626f0b4e68c6f0da3020
parenta3945bf84004ece5116861266a73a60d67beebbe (diff)
downloadqtlocation-mapboxgl-upstream/lp-color-alpha-decimal-format.tar.gz
[android] use locale sensitive DecimalFormat for color alpha conversionupstream/lp-color-alpha-decimal-format
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
index 91d674a62f..0c5786fda4 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java
@@ -14,6 +14,7 @@ import com.mapbox.mapboxsdk.R;
import com.mapbox.mapboxsdk.exceptions.ConversionException;
import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -147,7 +148,10 @@ public class ColorUtils {
* @return String rgba color
*/
public static String colorToRgbaString(@ColorInt int color) {
- String alpha = new DecimalFormat("#.###").format(((float) ((color >> 24) & 0xFF)) / 255.0f);
+ NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+ DecimalFormat decimalFormat = (DecimalFormat) numberFormat;
+ decimalFormat.applyPattern("#.###");
+ String alpha = decimalFormat.format(((float) ((color >> 24) & 0xFF)) / 255.0f);
return String.format(Locale.US, "rgba(%d, %d, %d, %s)",
(color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF, alpha);
}