From 97d7422b35767bb84a63ef0d6c78a657913300ff Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Mon, 9 Sep 2024 09:53:39 +0000
Subject: [PATCH] [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                           | 26 ++-----------------
 src/com/android/settings/Settings.java        |  1 -
 .../core/gateway/SettingsGateway.java         |  2 --
 .../LanguagePreferenceControllerTest.java     |  4 +--
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c001e03d094..d90ae05b73c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1068,28 +1068,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"
@@ -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>
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 493a27b6f26..502d779ff54 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -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 */ }
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 734bddcbb2a..3e92d5fb099 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -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(),
diff --git a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
index f8e790f55e7..656fa272ce2 100644
--- a/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/language/LanguagePreferenceControllerTest.java
@@ -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));
     }