summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/java/android/util/NativeTextHelper.java92
-rw-r--r--core/res/res/values-zh-rCN/strings.xml4
-rw-r--r--core/res/res/values-zh-rHK/strings.xml4
-rw-r--r--core/res/res/values/config.xml43
-rw-r--r--core/res/res/values/strings.xml5
-rw-r--r--core/res/res/values/symbols.xml14
6 files changed, 0 insertions, 162 deletions
diff --git a/core/java/android/util/NativeTextHelper.java b/core/java/android/util/NativeTextHelper.java
deleted file mode 100644
index eb380e9..0000000
--- a/core/java/android/util/NativeTextHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2015, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of The Linux Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package android.util;
-
-import android.content.Context;
-
-/**
- *@hide
- */
-public class NativeTextHelper {
-
- /**
- * parse the string to current language.
- *
- * @param context base context of the application
- * @param originalString original string
- * @param defPackage the target package where the local language strings
- * defined
- * @param originNamesId the id of the original string array.
- * @param localNamesId the id of the local string keys.
- * @return local language string
- */
- private static final String getLocalString(Context context, String originalString,
- String defPackage, int originNamesId, int localNamesId) {
- String[] origNames = context.getResources().getStringArray(originNamesId);
- String[] localNames = context.getResources().getStringArray(localNamesId);
- for (int i = 0; i < origNames.length; i++) {
- if (origNames[i].equalsIgnoreCase(originalString)) {
- return context.getString(context.getResources().getIdentifier(localNames[i],
- "string", defPackage));
- }
- }
- return originalString;
- }
-
- /**
- * parse the string to current language string in public resources.
- *
- * @param context base context of the application
- * @param originalString original string
- * @param originNamesId the id of the original string array.
- * @param localNamesId the id of the local string keys.
- * @return local language string
- */
- public static final String getLocalString(Context context, String originalString,
- int originNamesId, int localNamesId) {
- return getLocalString(context, originalString, "android", originNamesId, localNamesId);
- }
-
- /**
- * parse the string to current language string in current resources.
- *
- * @param context base context of the application
- * @param originalString original string
- * @param originNamesId the id of the original string array.
- * @param localNamesId the id of the local string keys.
- * @return local language string
- */
- public static final String getInternalLocalString(Context context, String originalString,
- int originNamesId,
- int localNamesId) {
- return getLocalString(context, originalString, context.getPackageName(), originNamesId,
- localNamesId);
- }
-
-}
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 5161d7e..20bff46 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -1520,8 +1520,4 @@
<item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item>
<item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item>
</plurals>
- <!-- Carrier Name -->
- <string name="China_Mobile">中国移动</string>
- <string name="China_Unicom">中国联通</string>
- <string name="China_Telecom">中国电信</string>
</resources>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 3576075..ef52d00 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -1517,8 +1517,4 @@
<item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item>
<item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item>
</plurals>
- <!-- Carrier Name -->
- <string name="China_Mobile">中國移動</string>
- <string name="China_Unicom">中國聯通</string>
- <string name="China_Telecom">中國電信</string>
</resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 8530e7e..d0a8f30 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2502,49 +2502,6 @@
NOTE: This requires additional hardware-specific code. -->
<bool name="config_ui_blur_enabled">false</bool>
- <string-array name="origin_carrier_names">
- <item>CHINA\u0020\u0020MOBILE</item>
- <item>CMCC</item>
- <item>CHN-UNICOM</item>
- <item>China Mobile</item>
- <item>China Unicom</item>
- <item>China Telecom</item>
- <item>中国移动</item>
- <item>中国联通</item>
- <item>中国电信</item>
- <item>中國移動</item>
- <item>中國聯通</item>
- <item>中國電信</item>
- <item>Searching for Service</item>
- </string-array>
-
- <string-array name="locale_carrier_names">
- <item>China_Mobile</item>
- <item>China_Mobile</item>
- <item>China_Unicom</item>
- <item>China_Mobile</item>
- <item>China_Unicom</item>
- <item>China_Telecom</item>
- <item>China_Mobile</item>
- <item>China_Unicom</item>
- <item>China_Telecom</item>
- <item>China_Mobile</item>
- <item>China_Unicom</item>
- <item>China_Telecom</item>
- <item>roamingTextSearching</item>
- </string-array>
-
- <!-- monitor locale change -->
- <bool name="config_monitor_locale_change">false</bool>
-
- <!-- display for radio tech -->
- <bool name="config_display_rat">false</bool>
-
- <!-- config 2G/3G/4G RAT strings for carriers -->
- <string name="config_rat_2g" translatable="false">2G</string>
- <string name="config_rat_3g" translatable="false">3G</string>
- <string name="config_rat_4g" translatable="false">4G</string>
-
<!-- When config_LTE_RSRP_threshold_type is set to "custom" -->
<integer-array name="config_LTE_RSRP_custom_levels">
<item>-140</item>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 3258ce2..4d83979 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4122,9 +4122,4 @@
<!-- Used to replace a range of characters in text that is too wide
for the space allocated to it (two dots). -->
<string name="ellipsis_two_dots">\u2025</string>
-
- <!-- Carrier Name -->
- <string name="China_Mobile">China Mobile</string>
- <string name="China_Unicom">China Unicom</string>
- <string name="China_Telecom">China Telecom</string>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 5fa5e3f..14779d0 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2408,19 +2408,5 @@
<java-symbol type="drawable" name="platlogo_m" />
- <!-- config 2G/3G/4G RAT strings for carriers -->
- <java-symbol type="string" name="config_rat_2g" />
- <java-symbol type="string" name="config_rat_3g" />
- <java-symbol type="string" name="config_rat_4g" />
-
- <!-- monitor locale change -->
- <java-symbol type="bool" name="config_monitor_locale_change" />
-
- <!-- display for radio tech -->
- <java-symbol type="bool" name="config_display_rat" />
-
- <java-symbol type="array" name="origin_carrier_names" />
- <java-symbol type="array" name="locale_carrier_names" />
-
<java-symbol type="string" name="config_packagedKeyboardName" />
</resources>
generated by cgit v1.1 at 2025-08-16 19:15:47 +0000