PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Language Setting] Cleanup Language and Input Setting" into main

Browse Source
This commit is contained in:
Shaowei Shen
2024-10-08 06:33:28 +00:00
committed by Android (Google) Code Review
parent 7da4079a91 97d7422b35
commit 4e1d24c5eb
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
AndroidManifest.xml
View File

@@ -1073,28 +1073,6 @@
android:theme="@android:style/Theme.NoDisplay">
</activity>
<activity
android:name=".Settings$LanguageAndInputSettingsActivity"
android:label="@string/language_settings"
android:exported="true"
android:icon="@drawable/ic_settings_language">
<intent-filter>
<action android:name="android.settings.LANGUAGE_SETTINGS"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.VOICE_LAUNCH"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.language.LanguageAndInputSettings"/>
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_system"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true"/>
</activity>
<activity
android:name=".Settings$LanguageSettingsActivity"
android:label="@string/languages_settings"
@@ -1225,9 +1203,9 @@
android:label="@string/language_input_gesture_title"
android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$LanguageAndInputSettingsActivity">
android:targetActivity="Settings$LanguageSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.language.LanguageAndInputSettings" />
android:value="com.android.settings.language.LanguageSettings" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_system"/>
</activity-alias>

1
src/com/android/settings/Settings.java
View File

@@ -95,7 +95,6 @@ public class Settings extends SettingsActivity {
public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }
public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocalePickerActivity extends SettingsActivity { /* empty */ }
public static class LanguageAndInputSettingsActivity extends SettingsActivity { /* empty */ }
public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity for the regional preferences settings. */
public static class RegionalPreferencesActivity extends SettingsActivity { /* empty */ }

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -437,8 +437,6 @@ public class SettingsGateway {
Settings.AdaptiveBrightnessActivity.class.getName(),
// Home page > Security & screen lock
Settings.LocationSettingsActivity.class.getName(),
// Home page > System
Settings.LanguageAndInputSettingsActivity.class.getName(),
Settings.LanguageSettingsActivity.class.getName(),
Settings.KeyboardSettingsActivity.class.getName(),
Settings.DateTimeSettingsActivity.class.getName(),

4
tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.language;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import android.content.ComponentName;
@@ -41,10 +40,9 @@ public class LanguagePreferenceControllerTest {
}
@Test
public void getAvailabilityStatus_featureFlagOff_LanguageAndInputSettingsActivitydisabled() {
public void getAvailabilityStatus_featureFlagOff_LanguageSettingsActivitydisabled() {
mController.getAvailabilityStatus();
assertFalse(isActivityEnable(mContext, Settings.LanguageAndInputSettingsActivity.class));
assertTrue(isActivityEnable(mContext, Settings.LanguageSettingsActivity.class));
}