commit 84fd69a7831e4875870a008b84158ee6688782f2
author Wei Huang <wei.x.huang@sonymobile.com> Thu Apr 17 14:10:50 2014 +0900
committer Amit Mahajan <amitmahajan@google.com> Fri Apr 01 18:57:22 2016 +0000
tree 4825332440ce505bc6b6cec9602309489971d36f
parent 8df04151d0461ce1520043eb74943f67f9a74aa8

MVNO value is not grayed out when MVNO type is none

MVNO type is judged as none by comparing key string to "None",
but this logic does not work when language setting is non English
because key is not "None" due to translation.

Bug: 27267663
Change-Id: Ic39a084cd77f661f833b13106dc28444926487d8

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 102d6cc..3163b63 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -453,11 +453,7 @@
             return null;
         } else {
             String[] values = mRes.getStringArray(R.array.mvno_type_entries);
-            if (values[mvnoIndex].equals("None")) {
-                mMvnoMatchData.setEnabled(false);
-            } else {
-                mMvnoMatchData.setEnabled(true);
-            }
+            mMvnoMatchData.setEnabled(mvnoIndex != 0);
             if (newValue != null && newValue.equals(oldValue) == false) {
                 if (values[mvnoIndex].equals("SPN")) {
                     mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());