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

Commit 067332ca authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev

parents f9fd3b9e c65ccd23

AndroidManifest.xml

+1 −21
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 
            <intent-filter android:priority="1">

                <action android:name="android.settings.WIRELESS_SETTINGS" />

                <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />

                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>
@@ -2624,27 +2625,6 @@ 
                android:resource="@xml/file_paths" />

        </provider>



        <activity

            android:name="Settings$SimSettingsActivity"

            android:label="@string/sim_settings_title"

            android:icon="@drawable/ic_settings_sim"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.order" android:value="-2"/>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.wireless" />

            <meta-data android:name="com.android.settings.summary"

                android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.sim.SimSettings" />

        </activity>



        <activity android:name=".sim.SimPreferenceDialog"

            android:theme="@style/Theme.AlertDialog"

            android:excludeFromRecents="true" />

src/com/android/settings/SettingsActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -612,11 +612,6 @@ public class SettingsActivity extends SettingsBaseActivity 
                !UserManager.isDeviceInDemoMode(this) /* enabled */,

                isAdmin) || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                        Settings.SimSettingsActivity.class.getName()),

                Utils.showSimCardTile(this), isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                        Settings.PowerUsageSummaryActivity.class.getName()),

                mBatteryPresent, isAdmin) || somethingChanged;

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

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ public class SettingsGateway { 
            // Home page > Network & Internet

            Settings.WifiSettingsActivity.class.getName(),

            Settings.DataUsageSummaryActivity.class.getName(),

            Settings.SimSettingsActivity.class.getName(),

            // Home page > Connected devices

            Settings.BluetoothSettingsActivity.class.getName(),

            Settings.WifiDisplaySettingsActivity.class.getName(),