commit 4d7a6248587500f336834dce6e2f11fe078bf106
author PauloftheWest <paulofthewest@google.com> Thu Dec 04 18:25:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 18:25:34 2014 +0000
tree ed73e5e55b1b07323fe26fa5271c55e98d371a7b
parent 91a4deb5e9cc957918c2e27e509300f3015c72d6
parent 7fa241549254ef727048efffb8affd2ccab73c18

Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev

res/xml/sim_settings.xml

diff --git a/res/xml/sim_settings.xml b/res/xml/sim_settings.xml
index 45d8225..63e4ba4 100644
--- a/res/xml/sim_settings.xml
+++ b/res/xml/sim_settings.xml
@@ -15,13 +15,10 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="sim_cards"
     android:title="@string/sim_settings_title">
 
     <PreferenceCategory
-            android:key="sim_cards"
-            android:title="@string/sim_settings_title" />
-
-    <PreferenceCategory
             android:key="sim_activities"
             android:title="@string/sim_pref_divider" >
 

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 6c3ddb5..7c50a83 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -30,7 +30,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
-import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
 import android.provider.Telephony;
@@ -118,7 +117,7 @@
     private SubscriptionInfo mCalls = null;
     private SubscriptionInfo mSMS = null;
 
-    private PreferenceCategory mSimCards = null;
+    private PreferenceScreen mSimCards = null;
 
     private SubscriptionManager mSubscriptionManager;
     private Utils mUtils;
@@ -151,14 +150,16 @@
 
         addPreferencesFromResource(R.xml.sim_settings);
 
-        mSimCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY);
+        mSimCards = (PreferenceScreen)findPreference(SIM_CARD_CATEGORY);
 
         final int numSlots = tm.getSimCount();
         mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
         mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
         for (int i = 0; i < numSlots; ++i) {
             final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), i);
-            mSimCards.addPreference(new SimPreference(getActivity(), sir, i));
+            SimPreference simPreference = new SimPreference(getActivity(), sir, i);
+            simPreference.setOrder(i-numSlots);
+            mSimCards.addPreference(simPreference);
             mAvailableSubInfos.add(sir);
             if (sir != null) {
                 mSelectableSubInfos.add(sir);