PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-dev

Browse Source
This commit is contained in:
Sanket Padawe
2014-12-04 18:12:40 +00:00
committed by Android (Google) Code Review
parent 3f5fd1feba 3b72ead136
commit 91a4deb5e9
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/sim_settings.xml
View File

@@ -15,12 +15,9 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="sim_cards"
android:title="@string/sim_settings_title"> android:title="@string/sim_settings_title">
<PreferenceCategory
android:key="sim_cards"
android:title="@string/sim_settings_title" />
<PreferenceCategory <PreferenceCategory
android:key="sim_activities" android:key="sim_activities"
android:title="@string/sim_pref_divider" > android:title="@string/sim_pref_divider" >

9
src/com/android/settings/sim/SimSettings.java
View File

@@ -30,7 +30,6 @@ import android.graphics.drawable.shapes.OvalShape;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.provider.Telephony; import android.provider.Telephony;
@@ -118,7 +117,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
private SubscriptionInfo mCalls = null; private SubscriptionInfo mCalls = null;
private SubscriptionInfo mSMS = null; private SubscriptionInfo mSMS = null;
private PreferenceCategory mSimCards = null; private PreferenceScreen mSimCards = null;
private SubscriptionManager mSubscriptionManager; private SubscriptionManager mSubscriptionManager;
private Utils mUtils; private Utils mUtils;
@@ -151,14 +150,16 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
addPreferencesFromResource(R.xml.sim_settings); addPreferencesFromResource(R.xml.sim_settings);
mSimCards = (PreferenceCategory)findPreference(SIM_CARD_CATEGORY); mSimCards = (PreferenceScreen)findPreference(SIM_CARD_CATEGORY);
final int numSlots = tm.getSimCount(); final int numSlots = tm.getSimCount();
mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots); mAvailableSubInfos = new ArrayList<SubscriptionInfo>(numSlots);
mSelectableSubInfos = new ArrayList<SubscriptionInfo>(); mSelectableSubInfos = new ArrayList<SubscriptionInfo>();
for (int i = 0; i < numSlots; ++i) { for (int i = 0; i < numSlots; ++i) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(getActivity(), 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); mAvailableSubInfos.add(sir);
if (sir != null) { if (sir != null) {
mSelectableSubInfos.add(sir); mSelectableSubInfos.add(sir);