From 2ae3e3b64ce4010288fb3b798e54fe670b1326fd Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 17 May 2024 23:37:48 +0800
Subject: [PATCH] Reland "Use autogenerated localeConfig"

Reland as https://issuetracker.google.com/294109810 has been fixed.
---
 app/build.gradle.kts                   |  1 +
 app/src/main/AndroidManifest.xml       |  1 -
 app/src/main/res/resources.properties  |  1 +
 app/src/main/res/xml/locale_config.xml | 14 --------------
 4 files changed, 2 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/resources.properties
 delete mode 100644 app/src/main/res/xml/locale_config.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index edebcf506..a3edc726e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,7 @@ plugins {
 android {
     compileSdk = 34
     ndkVersion = "27.0.11718014-beta1"
+    androidResources.generateLocaleConfig = true
 
     splits {
         abi {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1feeb4756..efd0d2666 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="@bool/large_heap"
-        android:localeConfig="@xml/locale_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
new file mode 100644
index 000000000..467b3efec
--- /dev/null
+++ b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
diff --git a/app/src/main/res/xml/locale_config.xml b/app/src/main/res/xml/locale_config.xml
deleted file mode 100644
index 49102ecee..000000000
--- a/app/src/main/res/xml/locale_config.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en-US"/>
-    <locale android:name="de"/>
-    <locale android:name="es"/>
-    <locale android:name="fr"/>
-    <locale android:name="ja"/>
-    <locale android:name="ko"/>
-    <locale android:name="nb-NO"/>
-    <locale android:name="th"/>
-    <locale android:name="tr"/>
-    <locale android:name="zh-CN"/>
-    <locale android:name="zh-HK"/>
-    <locale android:name="zh-TW"/>
-</locale-config>
\ No newline at end of file