Merge "Adjust testapps for API changes" into oc-mr1-dev
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 01a9c95..b1f95d0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -408,8 +408,8 @@
<string name="enable_pin" msgid="5422767284133234860">"Ενεργοποίηση/απενεργοποίηση αριθμού PIN της κάρτας SIM"</string>
<string name="change_pin" msgid="9174186126330785343">"Αλλαγή αριθμού PIN της κάρτας SIM"</string>
<string name="enter_pin_text" msgid="8532615714751931951">"Αριθμός PIN της κάρτας SIM:"</string>
- <string name="oldPinLabel" msgid="5287773661246368314">"Παλιός αριθμός PIN"</string>
- <string name="newPinLabel" msgid="207488227285336897">"Νέος αριθμός PIN"</string>
+ <string name="oldPinLabel" msgid="5287773661246368314">"Παλιό PIN"</string>
+ <string name="newPinLabel" msgid="207488227285336897">"Νέο PIN"</string>
<string name="confirmPinLabel" msgid="257597715098070206">"Επιβεβαίωση νέου αριθμού PIN"</string>
<string name="badPin" msgid="8955102849303984935">"Το παλιό PIN που πληκτρολογήσατε δεν είναι σωστό. Δοκιμάστε ξανά."</string>
<string name="mismatchPin" msgid="5923253370683071889">"Τα PIN που πληκτρολογήσατε δεν ταιριάζουν. Δοκιμάστε ξανά."</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 60f8c4e..c8520f4 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -355,7 +355,7 @@
<item msgid="7494167883478914080">"0"</item>
<item msgid="6043847456049107742">"1"</item>
</string-array>
- <string name="cdma_activate_device" msgid="3793805892364814518">"डीव्हाइस सक्रिय करा"</string>
+ <string name="cdma_activate_device" msgid="3793805892364814518">"डिव्हाइस सक्रिय करा"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"डेटा सेवा सेट अप करा"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिंग्ज"</string>
<string name="fdn" msgid="7878832555095183202">"निश्चित डायलिंग नंबर"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 63cc6ac..28b95ba 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -227,7 +227,7 @@
<string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"క్యారియర్, esim, sim, euicc"</string>
<string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="mobile_data_settings_title" msgid="4661165467914727157">"మొబైల్ డేటా"</string>
- <string name="mobile_data_settings_summary" msgid="5087255915840576895">"మొబైల్ నెట్వర్క్ను ఉపయోగించి డేటాను ప్రాప్యత చేయండి"</string>
+ <string name="mobile_data_settings_summary" msgid="5087255915840576895">"మొబైల్ నెట్వర్క్ను ఉపయోగించి డేటాను యాక్సెస్ చేయండి"</string>
<string name="data_usage_disable_mobile" msgid="3577275288809667615">"మొబైల్ డేటాని ఆఫ్ చేయాలా?"</string>
<string name="sim_selection_required_pref" msgid="7049424902961844236">"ఎంపిక అవసరం"</string>
<string name="sim_change_data_title" msgid="5332425991853799280">"డేటా SIMని మార్చాలా?"</string>
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index df39730..fc354ae 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1712,8 +1712,7 @@
PreferenceCategory networkOperatorCategory =
(PreferenceCategory) prefSet.findPreference(
NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);
- PreferenceScreen carrierSettings =
- (PreferenceScreen) prefSet.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
+ Preference carrierSettings = prefSet.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
if (apnExpand != null) {
apnExpand.setEnabled(isWorldMode() || enable);
}