diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java index 1246a50c..7a57f39e 100644 --- a/play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java +++ b/play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java @@ -16,6 +16,8 @@ package org.microg.gms.common; +import android.annotation.SuppressLint; + import android.app.ActivityManager; import android.content.Context; import android.content.pm.ConfigurationInfo; @@ -90,17 +92,24 @@ public class DeviceConfiguration { this.nativePlatforms = getNativePlatforms(); widthPixels = displayMetrics.widthPixels; heightPixels = displayMetrics.heightPixels; - locales = new ArrayList<>(Arrays.asList(context.getAssets().getLocales())); - for (int i = 0; i < locales.size(); i++) { - locales.set(i, locales.get(i).replace("-", "_")); - } - Collections.sort(locales); + locales = getLocales(context); Set glExtensions = new HashSet<>(); addEglExtensions(glExtensions); this.glExtensions = new ArrayList<>(glExtensions); Collections.sort(this.glExtensions); } + @SuppressLint("GetLocales") + private static List getLocales(Context context) { + List locales = new ArrayList(); + locales.addAll(Arrays.asList(context.getAssets().getLocales())); + for (int i = 0; i < locales.size(); i++) { + locales.set(i, locales.get(i).replace("-", "_")); + } + Collections.sort(locales); + return locales; + } + @SuppressWarnings({"InlinedApi"}) private static List getNativePlatforms() { <<<<<<< HEAD diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index f9797a58..01d928ca 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -97,6 +97,12 @@ android { } } +<<<<<<< HEAD +======= + lintOptions { + disable 'MissingTranslation', 'GetLocales', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'Range' + } +>>>>>>> a907c391 (Build: Fix GetLocales lint https://github.com/microg/GmsCore/commit/f0b15d275a0c4ec3625033d651414d396e368320) buildTypes { release { diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle index 9b1df7b8..039e97f1 100644 --- a/play-services-core/microg-ui-tools/build.gradle +++ b/play-services-core/microg-ui-tools/build.gradle @@ -31,8 +31,15 @@ android { sourceCompatibility = 11 targetCompatibility = 11 } +<<<<<<< HEAD lint { disable 'MissingTranslation' +======= + + lintOptions { + // TODO: Remove MissingTranslation once we have stable strings and proper translations. + disable 'MissingTranslation', 'GetLocales' +>>>>>>> a907c391 (Build: Fix GetLocales lint https://github.com/microg/GmsCore/commit/f0b15d275a0c4ec3625033d651414d396e368320) } namespace 'org.microg.tools.ui'