— a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -76,7 +76,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
final Activity activity = getActivity();
if (activity == null) {
return;
-
}
-
}} activity.setTitle(R.string.language_settings);
diff --git a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocaleListEditor.java b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocaleListEditor.java
old mode 100644
new mode 100755
index bee51529561…d82a84ef95c
— a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -43,6 +43,7 @@ import com.android.settings.RestrictedSettingsFragment;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import android.util.Log;
/**
- Drag-and-drop editor for the user-ordered locale lists.
@@ -159,7 +160,10 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
final LocaleStore.LocaleInfo locale =
(LocaleStore.LocaleInfo) data.getSerializableExtra(
INTENT_LOCALE_KEY);
-
mAdapter.addLocale(locale);
-
//mAdapter.addLocale(locale);
-
//set system language add by psj 2023/11/02
-
LocalePicker.updateLocale(locale.getLocale());
-
updateVisibilityOfRemoveMenu(); } super.onActivityResult(requestCode, resultCode, data);
@@ -282,6 +286,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
mAddLanguage.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
Log.e("LocalListEditor","peng==configureDragAndDrop=="); final Intent intent = new Intent(getActivity(), LocalePickerWithRegionActivity.class); startActivityForResult(intent, REQUEST_LOCALE_PICKER);
diff --git a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
old mode 100644
new mode 100755
index 6ddcf2396c9…5c642db5a92
— a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
+++ b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/localepicker/LocalePickerWithRegionActivity.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
import com.android.internal.app.LocalePickerWithRegion;
import com.android.internal.app.LocaleStore;
+import android.util.Log;
public class LocalePickerWithRegionActivity extends Activity
implements LocalePickerWithRegion.LocaleSelectedListener {
@@ -56,12 +57,14 @@ public class LocalePickerWithRegionActivity extends Activity
@Override
public void onLocaleSelected(LocaleStore.LocaleInfo locale) {
-
Log.e("LocalePicker","peng==onLocaleSelected=="+locale); final Intent intent = new Intent(); intent.putExtra(LocaleListEditor.INTENT_LOCALE_KEY, locale); setResult(RESULT_OK, intent); finish();
}
-
@Override
public void onBackPressed() {
handleBackPressed();