summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Wang <flwang@codeaurora.org>2013-07-02 12:22:45 -0700
committercretin45 <cretin45@gmail.com>2014-09-03 13:56:19 -0700
commita29ee7957045c5fe91b01916c29aabbb11dec736 (patch)
treea923d1212cf2edac634f1f6da1251b38159d8e2a
parent9cde9e448fde08af95e9cf2fa4c1ed92fa9a6084 (diff)
downloadandroid_packages_providers_TelephonyProvider-a29ee7957045c5fe91b01916c29aabbb11dec736.tar.gz
android_packages_providers_TelephonyProvider-a29ee7957045c5fe91b01916c29aabbb11dec736.tar.bz2
android_packages_providers_TelephonyProvider-a29ee7957045c5fe91b01916c29aabbb11dec736.zip
TelephonyProvider :Add multi-language APN name support
Add a new column "localized_name" to the carriers database for multi-language APN name support. The value of localized_name refers to a string resource id in Strings.xml Change-Id: If8cd518a42a9f38b35810e8bab498f615f3b81c0
-rw-r--r--res/values/cm_strings.xml3
-rwxr-xr-x[-rw-r--r--]src/com/android/providers/telephony/TelephonyProvider.java8
2 files changed, 10 insertions, 1 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 70ce492..5882db7 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -20,4 +20,7 @@
<!-- Apn read only -->
<string name="read_only">read_only</string>
+
+ <!-- Apn localized name -->
+ <string name="localized_name">localized_name</string>
</resources>
diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index e2aca81..6419a16 100644..100755
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -156,7 +156,8 @@ public class TelephonyProvider extends ContentProvider
"mvno_match_data TEXT," +
"preferred BOOLEAN DEFAULT 0," +
"read_only BOOLEAN DEFAULT 0," +
- "ppp_number TEXT);");
+ "ppp_number TEXT," +
+ "localized_name TEXT);");
initDatabase(db);
}
@@ -319,6 +320,8 @@ public class TelephonyProvider extends ContentProvider
map.put(Telephony.Carriers.PASSWORD, parser.getAttributeValue(null, "password"));
map.put(mContext.getString(R.string.ppp_number),
parser.getAttributeValue(null, "ppp_number"));
+ map.put(mContext.getString(R.string.localized_name),
+ parser.getAttributeValue(null, "localized_name"));
// do not add NULL to the map so that insert() will set the default value
String proxy = parser.getAttributeValue(null, "proxy");
@@ -759,6 +762,9 @@ public class TelephonyProvider extends ContentProvider
if (!values.containsKey(getContext().getString(R.string.read_only))) {
values.put(getContext().getString(R.string.read_only), false);
}
+ if (!values.containsKey(getContext().getString(R.string.localized_name))) {
+ values.put(getContext().getString(R.string.localized_name), "");
+ }
long rowID = db.insert(CARRIERS_TABLE, null, values);
if (rowID > 0)