Revert "#1973 add option to change app language on Android 13+"

This reverts commit 8e1ee50.

Author: sds100

app/build.gradle.kts

@@ -91,10 +91,6 @@ android {
         }
     }
 
-    androidResources {
-        generateLocaleConfig = true
-    }
-
     buildFeatures {
         dataBinding = true
         aidl = true

app/src/main/res/resources.properties

@@ -5,7 +5,7 @@
 
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.READ_LOGS"/>
 
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
@@ -117,14 +117,5 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
-
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
     </application>
 </manifest>

base/src/main/AndroidManifest.xml

@@ -29,7 +29,6 @@ import io.github.sds100.keymapper.base.input.InputEventDetectionSource
 import io.github.sds100.keymapper.base.input.InputEventHubImpl
 import io.github.sds100.keymapper.base.keymaps.ConfigKeyMapStateImpl
 import io.github.sds100.keymapper.base.onboarding.OnboardingUseCase
-import io.github.sds100.keymapper.base.settings.AppLocaleAdapterImpl
 import io.github.sds100.keymapper.base.system.accessibility.AccessibilityServiceAdapterImpl
 import io.github.sds100.keymapper.base.system.permissions.RequestPermissionDelegate
 import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
@@ -105,9 +104,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
     @Inject
     lateinit var configKeyMapState: ConfigKeyMapStateImpl
 
-    @Inject
-    lateinit var appLocaleAdapter: AppLocaleAdapterImpl
-
     private lateinit var requestPermissionDelegate: RequestPermissionDelegate
 
     private val currentNightMode: Int
@@ -205,7 +201,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
         systemBridgeSetupController.invalidateSettings()
         networkAdapter.invalidateState()
         onboardingUseCase.handledMigrateScreenOffKeyMapsNotification()
-        appLocaleAdapter.invalidate()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {

base/src/main/java/io/github/sds100/keymapper/base/BaseMainActivity.kt

@@ -30,8 +30,6 @@ import io.github.sds100.keymapper.base.onboarding.OnboardingUseCase
 import io.github.sds100.keymapper.base.onboarding.OnboardingUseCaseImpl
 import io.github.sds100.keymapper.base.onboarding.SetupAccessibilityServiceDelegate
 import io.github.sds100.keymapper.base.onboarding.SetupAccessibilityServiceDelegateImpl
-import io.github.sds100.keymapper.base.settings.AppLocaleAdapter
-import io.github.sds100.keymapper.base.settings.AppLocaleAdapterImpl
 import io.github.sds100.keymapper.base.system.accessibility.AccessibilityServiceAdapterImpl
 import io.github.sds100.keymapper.base.system.accessibility.ControlAccessibilityServiceUseCase
 import io.github.sds100.keymapper.base.system.accessibility.ControlAccessibilityServiceUseCaseImpl
@@ -210,8 +208,4 @@ abstract class BaseSingletonHiltModule {
     @Binds
     @Singleton
     abstract fun bindClock(impl: ClockImpl): Clock
-
-    @Binds
-    @Singleton
-    abstract fun bindAppLocaleAdapter(impl: AppLocaleAdapterImpl): AppLocaleAdapter
 }

base/src/main/java/io/github/sds100/keymapper/base/BaseSingletonHiltModule.kt

@@ -516,7 +516,7 @@ private fun IncompatibleUsbModeCard(modifier: Modifier = Modifier) {
             SettingsUtils.launchSettingsScreen(
                 ctx,
                 Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS,
-                fragmentArg = "default_usb_configuration",
+                "default_usb_configuration",
             )
         },
     )

base/src/main/java/io/github/sds100/keymapper/base/expertmode/ExpertModeScreen.kt

@@ -1,14 +1,10 @@
 package io.github.sds100.keymapper.base.settings
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.datastore.preferences.core.Preferences
-import dagger.hilt.android.scopes.ViewModelScoped
 import io.github.sds100.keymapper.base.actions.sound.SoundFileInfo
 import io.github.sds100.keymapper.base.actions.sound.SoundsManager
 import io.github.sds100.keymapper.base.system.inputmethod.KeyMapperImeHelper
 import io.github.sds100.keymapper.base.system.inputmethod.SwitchImeInterface
-import io.github.sds100.keymapper.base.utils.ui.ResourceProvider
 import io.github.sds100.keymapper.common.BuildConfigProvider
 import io.github.sds100.keymapper.common.utils.InputDeviceInfo
 import io.github.sds100.keymapper.common.utils.KMResult
@@ -34,7 +30,6 @@ import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.map
 
-@ViewModelScoped
 class ConfigSettingsUseCaseImpl @Inject constructor(
     private val preferences: PreferenceRepository,
     private val permissionAdapter: PermissionAdapter,
@@ -47,8 +42,6 @@ class ConfigSettingsUseCaseImpl @Inject constructor(
     private val devicesAdapter: DevicesAdapter,
     private val buildConfigProvider: BuildConfigProvider,
     private val notificationAdapter: NotificationAdapter,
-    private val appLocaleAdapter: AppLocaleAdapter,
-    private val resourceProvider: ResourceProvider,
 ) : ConfigSettingsUseCase {
 
     private val imeHelper by lazy {
@@ -201,20 +194,6 @@ class ConfigSettingsUseCaseImpl @Inject constructor(
     override fun openNotificationChannelSettings(channelId: String) {
         notificationAdapter.openChannelSettings(channelId)
     }
-
-    override val currentLocaleDisplayName: StateFlow<String?> =
-        appLocaleAdapter.currentLocaleDisplayName
-
-    override fun launchAppLocaleSettingsScreen(): Boolean =
-        appLocaleAdapter.launchAppLocaleSettingsScreen()
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    override fun getSupportedLocales(): List<AppLocaleOption> =
-        appLocaleAdapter.getSupportedLocales()
-
-    override fun setLocale(localeTag: String?) {
-        appLocaleAdapter.setLocale(localeTag)
-    }
 }
 
 interface ConfigSettingsUseCase {
@@ -260,13 +239,4 @@ interface ConfigSettingsUseCase {
 
     val connectedInputDevices: StateFlow<State<List<InputDeviceInfo>>>
     fun resetAllSettings()
-
-    // Locale settings (Android 13+ only)
-    val currentLocaleDisplayName: StateFlow<String?>
-    fun launchAppLocaleSettingsScreen(): Boolean
-
-    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
-    fun getSupportedLocales(): List<AppLocaleOption>
-
-    fun setLocale(localeTag: String?)
 }

base/src/main/java/io/github/sds100/keymapper/base/settings/AppLocaleAdapter.kt

@@ -24,7 +24,6 @@ import androidx.compose.material.icons.outlined.Android
 import androidx.compose.material.icons.outlined.BugReport
 import androidx.compose.material.icons.outlined.FindInPage
 import androidx.compose.material.icons.outlined.Gamepad
-import androidx.compose.material.icons.outlined.Language
 import androidx.compose.material.icons.outlined.OfflineBolt
 import androidx.compose.material.icons.rounded.Code
 import androidx.compose.material.icons.rounded.Construction
@@ -79,12 +78,10 @@ import kotlinx.coroutines.launch
 
 private val isExpertModeSupported = Build.VERSION.SDK_INT >= Constants.SYSTEM_BRIDGE_MIN_API
 private val isAutoSwitchImeSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-private val isLanguageSettingsSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
 
 @Composable
 fun SettingsScreen(modifier: Modifier = Modifier, viewModel: SettingsViewModel) {
     val state by viewModel.mainScreenState.collectAsStateWithLifecycle()
-    val currentLocaleDisplayName by viewModel.currentLocaleDisplayName.collectAsStateWithLifecycle()
     val snackbarHostState = SnackbarHostState()
     var showAutomaticBackupDialog by remember { mutableStateOf(false) }
     val context = LocalContext.current
@@ -149,8 +146,6 @@ fun SettingsScreen(modifier: Modifier = Modifier, viewModel: SettingsViewModel)
     ) {
         Content(
             state = state,
-            currentLocaleDisplayName = currentLocaleDisplayName ?: "",
-            onLanguageClick = viewModel::onLanguageClick,
             onThemeSelected = viewModel::onThemeSelected,
             onPauseResumeNotificationClick = viewModel::onPauseResumeNotificationClick,
             onDefaultOptionsClick = viewModel::onDefaultOptionsClick,
@@ -246,8 +241,6 @@ private fun SettingsScreen(
 private fun Content(
     modifier: Modifier = Modifier,
     state: MainSettingsState,
-    currentLocaleDisplayName: String = "",
-    onLanguageClick: () -> Unit = { },
     onThemeSelected: (Theme) -> Unit = { },
     onPauseResumeNotificationClick: () -> Unit = { },
     onDefaultOptionsClick: () -> Unit = { },
@@ -294,21 +287,6 @@ private fun Content(
             onStateSelected = onThemeSelected,
         )
 
-        OptionPageButton(
-            title = stringResource(R.string.title_pref_language),
-            text = if (isLanguageSettingsSupported) {
-                currentLocaleDisplayName
-            } else {
-                stringResource(
-                    R.string.error_sdk_version_too_low,
-                    BuildUtils.getSdkVersionName(Build.VERSION_CODES.TIRAMISU),
-                )
-            },
-            icon = Icons.Outlined.Language,
-            onClick = onLanguageClick,
-            enabled = isLanguageSettingsSupported,
-        )
-
         OptionPageButton(
             title = stringResource(R.string.title_pref_show_toggle_keymaps_notification),
             text = stringResource(R.string.summary_pref_show_toggle_keymaps_notification),
@@ -494,7 +472,6 @@ private fun Preview() {
         SettingsScreen(modifier = Modifier.fillMaxSize(), onBackClick = {}) {
             Content(
                 state = MainSettingsState(),
-                currentLocaleDisplayName = "System default",
             )
         }
     }

base/src/main/java/io/github/sds100/keymapper/base/settings/ConfigSettingsUseCase.kt

@@ -110,17 +110,6 @@ class SettingsViewModel @Inject constructor(
         )
     }.stateIn(viewModelScope, SharingStarted.Lazily, AutomaticChangeImeSettingsState())
 
-    /**
-     * The display name of the currently selected locale, or null if not supported (Android < 13).
-     */
-    val currentLocaleDisplayName: StateFlow<String?> = useCase.currentLocaleDisplayName
-
-    fun onLanguageClick() {
-        viewModelScope.launch {
-            useCase.launchAppLocaleSettingsScreen()
-        }
-    }
-
     fun setAutomaticBackupLocation(uri: String) = useCase.setAutomaticBackupLocation(uri)
 
     fun disableAutomaticBackup() = useCase.disableAutomaticBackup()
@@ -178,6 +167,10 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    fun onRequestRootClick() {
+        useCase.requestRootPermission()
+    }
+
     fun onExpertModeClick() {
         viewModelScope.launch {
             navigate("expert_mode_settings", NavDestination.ExpertMode)