diff --git a/aconfig/catalyst/system.aconfig b/aconfig/catalyst/system.aconfig new file mode 100644 index 00000000000..f87ff44a909 --- /dev/null +++ b/aconfig/catalyst/system.aconfig @@ -0,0 +1,9 @@ +package: "com.android.settings.flags" +container: "system" + +flag { + name: "catalyst_language_setting" + namespace: "android_settings" + description: "Flag for System -> Languages screen" + bug: "323791114" +} diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml index 4613cb0bad0..7618399db97 100644 --- a/res/xml/language_settings.xml +++ b/res/xml/language_settings.xml @@ -19,7 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/languages_settings" - android:key="languages_settings"> + android:key="language_settings"> diff --git a/src/com/android/settings/language/LanguageSettingScreen.kt b/src/com/android/settings/language/LanguageSettingScreen.kt new file mode 100644 index 00000000000..09ca11be979 --- /dev/null +++ b/src/com/android/settings/language/LanguageSettingScreen.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.settings.language + +import android.content.ComponentName +import android.content.Context +import android.content.pm.PackageManager +import com.android.settings.R +import com.android.settings.Settings.LanguageSettingsActivity +import com.android.settings.flags.Flags +import com.android.settingslib.metadata.PreferenceAvailabilityProvider +import com.android.settingslib.metadata.ProvidePreferenceScreen +import com.android.settingslib.metadata.preferenceHierarchy +import com.android.settingslib.preference.PreferenceScreenCreator + +@ProvidePreferenceScreen +class LanguageSettingScreen: PreferenceScreenCreator { + override val key: String + get() = KEY + + override val title: Int + get() = R.string.languages_settings + + override val summary: Int + get() = R.string.languages_setting_summary + + override val icon: Int + get() = R.drawable.ic_settings_languages + + override fun isFlagEnabled(context: Context) = Flags.catalystLanguageSetting() + + override fun hasCompleteHierarchy() = false + + override fun fragmentClass() = LanguageSettings::class.java + + override fun getPreferenceHierarchy(context: Context) = preferenceHierarchy(this) {} + + companion object { + const val KEY = "language_setting" + } +} diff --git a/src/com/android/settings/language/LanguageSettings.java b/src/com/android/settings/language/LanguageSettings.java index a5adb02b5b9..d992ff27bc9 100644 --- a/src/com/android/settings/language/LanguageSettings.java +++ b/src/com/android/settings/language/LanguageSettings.java @@ -66,6 +66,11 @@ public class LanguageSettings extends DashboardFragment { activity.setTitle(R.string.languages_settings); } + @Override + public @Nullable String getPreferenceScreenBindingKey(@NonNull Context context) { + return LanguageSettingScreen.KEY; + } + @Override protected int getPreferenceScreenResId() { return R.xml.language_settings; diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index be43f8ef923..07df3c847a8 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -26,11 +26,14 @@ android_test { "androidx.test.ext.junit", "androidx.test.rules", "flag-junit", + "kotlin-test", + "mockito-kotlin2", "mockito-target-minus-junit4", "platform-test-annotations", "platform-test-rules", "truth", "kotlinx_coroutines_test", + "SettingsLibPreference-testutils", "Settings-testutils2", "servicestests-utils", // Don't add SettingsLib libraries here - you can use them directly as they are in the diff --git a/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt b/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt new file mode 100644 index 00000000000..7b519a27cab --- /dev/null +++ b/tests/unit/src/com/android/settings/language/LanguageSettingScreenTest.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.settings.language + +import android.content.ComponentName +import android.content.Context +import android.content.ContextWrapper +import android.content.pm.PackageManager +import android.content.res.Resources +import com.android.settings.Settings.LanguageSettingsActivity +import com.android.settings.flags.Flags +import com.android.settingslib.preference.CatalystScreenTestCase +import com.google.common.truth.Truth.assertThat +import org.junit.Assert +import org.junit.Test +import org.mockito.ArgumentMatchers.anyInt +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.stub + +class LanguageSettingScreenTest: CatalystScreenTestCase() { + override val preferenceScreenCreator = LanguageSettingScreen() + + override val flagName: String + get() = Flags.FLAG_CATALYST_LANGUAGE_SETTING + + @Test + fun key() { + assertThat(preferenceScreenCreator.key).isEqualTo(LanguageSettingScreen.KEY) + } + + override fun migration() {} +}