diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2014-12-05 16:26:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 16:26:39 +0000 |
| commit | 9a73365ed7a66ffdf7507b4d040f97debde3b00e (patch) | |
| tree | e9aa71f2189f883cf05ad121c6b87ff3f29afa58 /src/com/android/settings | |
| parent | 94eb04617fdb73d74c5f1751f674762e6657dc03 (diff) | |
| parent | 76fd9d62facb2c683b69c2e4280534abdb2281bd (diff) | |
| download | packages_apps_Settings-9a73365ed7a66ffdf7507b4d040f97debde3b00e.tar.gz packages_apps_Settings-9a73365ed7a66ffdf7507b4d040f97debde3b00e.tar.bz2 packages_apps_Settings-9a73365ed7a66ffdf7507b4d040f97debde3b00e.zip | |
am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev
* commit '76fd9d62facb2c683b69c2e4280534abdb2281bd':
Removed unnecessary heading in Sim settings
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 6c3ddb5a6..7c50a838b 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -30,7 +30,6 @@ import android.graphics.drawable.shapes.OvalShape; 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 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 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 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 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); |