commit 97d7422b35767bb84a63ef0d6c78a657913300ff
author shaoweishen <shaoweishen@google.com> Mon Sep 09 09:53:39 2024 +0000
committer shaoweishen <shaoweishen@google.com> Tue Sep 10 09:20:49 2024 +0000
tree 14fcc6e51b5ef438f13d3142111424ec241d6b05
parent dcc253096424033f33598774d64f93c64ccf3ded

[Language Setting] Cleanup Language and Input Setting

Clean up LanguageAndInputSettingsActivity since we already migrated to
LanguageSettingsActivity and InputSettingsActivity.

Bug: 330517633
Test: manual
Flag: EXEMPT bugfix

Change-Id: I32ef1bf4105355f1d11b728f51dcb3f7dc896c67

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c001e03..d90ae05 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1069,28 +1069,6 @@
         </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"
             android:exported="true"
@@ -1220,9 +1198,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>