Revert "SystemUI: Customize StatusBar for China carriers" (55bcdc76) · Commits · e / os / android_frameworks_base

core/java/android/util/NativeTextHelper.java

deleted100644 → 0

+0 −92

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015-2016, 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);
		}

		}

core/res/res/values-zh-rCN/strings.xml

+0 −5

Original line number	Diff line number	Diff line
		@@ -1681,11 +1681,6 @@
		<string name="audit_safemode_notification" msgid="6416076898350685856">"恢复出厂设置即可正常使用此设备，不受任何限制"</string>
		<string name="audit_safemode_notification_details" msgid="1860601176690176413">"触摸即可了解详情。"</string>
		<string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string>

		<!-- Carrier Name -->
		<string name="China_Mobile">中国移动</string>
		<string name="China_Unicom">中国联通</string>
		<string name="China_Telecom">中国电信</string>
		<string name="other_permissions">其他权限</string>
		<string name="permission_remember_choice">永远记住</string>
		<string name="permission_title">权限</string>

core/res/res/values-zh-rHK/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -1679,9 +1679,5 @@
		<string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸以瞭解詳情。"</string>
		<string name="suspended_widget_accessibility" msgid="6712143096475264190">"「<xliff:g id="LABEL">%1$s</xliff:g>」已停用"</string>
		<string name="global_action_reboot">"重新啟動"</string>
		<!-- Carrier Name -->
		<string name="China_Mobile">中國移動</string>
		<string name="China_Unicom">中國聯通</string>
		<string name="China_Telecom">中國電信</string>
		<string name="conference_call" msgid="3751093130790472426">"會議通話"</string>
		</resources>

core/res/res/values/config.xml

+1 −45

Original line number	Diff line number	Diff line
		@@ -2650,50 +2650,6 @@

		<!-- Configuartion to support SIM contact batch operation.-->
		<bool name="config_sim_phonebook_batch_operation">true</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>CHN-CT</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_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>

		<!-- Zero Balance redirect URL config -->
		<string name="operator_config_url" translatable="false"></string>

core/res/res/values/strings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -4436,10 +4436,6 @@
		<!-- Accessibilty string added to a widget that has been suspended [CHAR LIMIT=20] -->
		<string name="suspended_widget_accessibility">Disabled <xliff:g id="label" example="Calendar">%1$s</xliff:g></string>

		<!-- Carrier Name -->
		<string name="China_Mobile">China Mobile</string>
		<string name="China_Unicom">China Unicom</string>
		<string name="China_Telecom">China Telecom</string>
		<!-- Label used by Telephony code, assigned as the display name for conference calls [CHAR LIMIT=60] -->
		<string name="conference_call">Conference Call</string>
		</resources>