commit ebbe9a6796eb96776c77c70a0890af3d228e789b
author Elliott Hughes <enh@google.com> Thu Oct 02 23:35:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 02 23:35:07 2014 +0000
tree 7c298c1da145b423d90cc186c372a648cbc7fbcc
parent 28ec3d9db7d1773e53751ecf82a146351fc763dc
parent f9d6d2916323472f6c543edcc3956a8d00925e6b

Merge "Use the StorageManager constant for the PatternVisible key." into lmp-mr1-dev

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 08cfc58..a46df0a 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -877,8 +877,8 @@
                 (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
 
         // TODO: Uncomment to re-enable SimSettings.
-        // return tm.getSimCount() > 0;
-        return false;
+        return tm.getSimCount() > 0;
+        //return false;
     }
 
     /**

src/com/android/settings/sim/SimSettings.java

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 07d09f3..a49ede6 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -201,7 +201,7 @@
         if (sir != null) {
             simPref.setSelectedItem(sir.slotId + 1);
         }
-        simPref.setEnabled(mNumSims > 1);
+        simPref.setEnabled(mNumSims >= 1);
     }
 
     private void updateCellularDataValues() {
@@ -210,7 +210,7 @@
         if (sir != null) {
             simPref.setSelectedItem(sir.slotId);
         }
-        simPref.setEnabled(mNumSims > 1);
+        simPref.setEnabled(mNumSims >= 1);
     }
 
     private void updateCallValues() {
@@ -219,7 +219,7 @@
         if (sir != null) {
             simPref.setSelectedItem(sir.slotId + 1);
         }
-        simPref.setEnabled(mNumSims > 1);
+        simPref.setEnabled(mNumSims >= 1);
     }
 
     @Override