Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6c023be authored by Pinyao Ting's avatar Pinyao Ting
Browse files

Revert "[Setting] Cleanup Unused SimSettings" 

This reverts commit 0d9d3419.

Reason for revert: Potential culprit for b/146229292 - verifying through Forrest before revert submission

Change-Id: I29a3ed1a44ea324e0fa88cda2e5baecb441f7922
parent 0d9d3419

res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -695,6 +695,12 @@ 
    <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->

    <string name="radio_controls_summary">Manage Wi\u2011Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>









    <!-- check box cellular data title [CHAR LIMIT=30] -->









    <string name="cellular_data_title">Mobile data</string>









    <!-- check box Calls title [CHAR LIMIT=30] -->









    <string name="calls_title">Allow calls</string>









    <!-- check box SMS Messges title [CHAR LIMIT=30] -->









    <string name="sms_messages_title">SMS messages</string>









    <!-- check box cellular data summary [CHAR LIMIT=85] -->









    <string name="cellular_data_summary">Allow data usage over mobile network</string>









    <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->








@@ -7211,6 +7217,8 @@







    <string name="sim_select_card">Select a SIM card</string>









    <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->









    <string name="sim_card_number_title">SIM <xliff:g id="card_number">%1$d</xliff:g></string>









    <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->









    <string name="sim_slot_empty">SIM empty</string>









    <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->









    <string name="sim_editor_name">SIM name</string>









    <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->








@@ -7256,6 +7264,8 @@







    <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->









    <string name="sim_notification_summary">Tap to set up</string>

















    <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->









    <string name="sim_pref_divider">Preferred SIM for</string>









    <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->









    <string name="sim_calls_ask_first_prefs_title">Ask every time</string>









    <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->

























res/xml/sim_settings.xml
0 → 100644



+37
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2014 The Android Open Source Project



















     Licensed under the Apache License, Version 2.0 (the "License");









     you may not use this file except in compliance with the License.









     You may obtain a copy of the License at



















          http://www.apache.org/licenses/LICENSE-2.0



















     Unless required by applicable law or agreed to in writing, software









     distributed under the License is distributed on an "AS IS" BASIS,









     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









     See the License for the specific language governing permissions and









     limitations under the License.









-->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









    android:key="sim_cards"









    android:title="@string/sim_settings_title">



















    <PreferenceCategory









            android:key="sim_activities"









            android:title="@string/sim_pref_divider" >



















        <Preference android:key="sim_cellular_data"









            android:title="@string/cellular_data_title" />



















        <Preference android:key="sim_calls"









            android:title="@string/calls_title" />



















        <Preference android:key="sim_sms"









            android:title="@string/sms_messages_title" />



















    </PreferenceCategory>





























</PreferenceScreen>
























src/com/android/settings/Settings.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -33,6 +33,7 @@ public class Settings extends SettingsActivity {







    public static class CreateShortcutActivity extends SettingsActivity { /* empty */ }









    public static class FaceSettingsActivity extends SettingsActivity { /* empty */ }









    public static class FingerprintSettingsActivity extends SettingsActivity { /* empty */ }









    public static class SimSettingsActivity extends SettingsActivity { /* empty */ }









    public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }









    public static class WifiTetherSettingsActivity extends SettingsActivity { /* empty */ }









    public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
































src/com/android/settings/core/gateway/SettingsGateway.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -127,6 +127,7 @@ import com.android.settings.security.CryptKeeperSettings;







import com.android.settings.security.LockscreenDashboardFragment;









import com.android.settings.security.SecuritySettings;









import com.android.settings.shortcut.CreateShortcut;









import com.android.settings.sim.SimSettings;









import com.android.settings.support.SupportDashboardActivity;









import com.android.settings.system.ResetDashboardFragment;









import com.android.settings.system.SystemDashboardFragment;








@@ -158,6 +159,7 @@ public class SettingsGateway {







            WifiSettings.class.getName(),









            ConfigureWifiSettings.class.getName(),









            SavedAccessPointsWifiSettings.class.getName(),









            SimSettings.class.getName(),









            TetherSettings.class.getName(),









            WifiP2pSettings.class.getName(),









            WifiTetherSettings.class.getName(),
































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



+1
−2






























Original line number
Diff line number
Diff line







@@ -56,14 +56,13 @@ public class SimPreferenceDialog extends Activity {







    View mDialogLayout;









    private final String SIM_NAME = "sim_name";









    private final String TINT_POS = "tint_pos";









    private static final String EXTRA_SLOT_ID = "slot_id";



















    @Override









    public void onCreate(Bundle bundle) {









        super.onCreate(bundle);









        mContext = this;









        final Bundle extras = getIntent().getExtras();









        mSlotId = extras.getInt(EXTRA_SLOT_ID, -1);









        mSlotId = extras.getInt(SimSettings.EXTRA_SLOT_ID, -1);









        mSubscriptionManager = SubscriptionManager.from(mContext);









        mSubInfoRecord = mSubscriptionManager.getActiveSubscriptionInfoForSimSlotIndex(mSlotId);









        mTintArr = mContext.getResources().getIntArray(com.android.internal.R.array.sim_colors);