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

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

Browse Source
This commit is contained in:
Andrew Sapperstein
2019-04-26 20:27:01 +00:00
committed by Android (Google) Code Review
parent f9fd3b9e17 c65ccd23b4
commit 067332ca9e
3 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
AndroidManifest.xml
View File

@@ -183,6 +183,7 @@
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.WIRELESS_SETTINGS" /> <action android:name="android.settings.WIRELESS_SETTINGS" />
<action android:name="android.settings.AIRPLANE_MODE_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" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
@@ -2624,27 +2625,6 @@
android:resource="@xml/file_paths" /> android:resource="@xml/file_paths" />
</provider> </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" <activity android:name=".sim.SimPreferenceDialog"
android:theme="@style/Theme.AlertDialog" android:theme="@style/Theme.AlertDialog"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />

5
src/com/android/settings/SettingsActivity.java
View File

@@ -612,11 +612,6 @@ public class SettingsActivity extends SettingsBaseActivity
!UserManager.isDeviceInDemoMode(this) /* enabled */, !UserManager.isDeviceInDemoMode(this) /* enabled */,
isAdmin) || somethingChanged; isAdmin) || somethingChanged;
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
Settings.SimSettingsActivity.class.getName()),
Utils.showSimCardTile(this), isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
Settings.PowerUsageSummaryActivity.class.getName()), Settings.PowerUsageSummaryActivity.class.getName()),
mBatteryPresent, isAdmin) || somethingChanged; mBatteryPresent, isAdmin) || somethingChanged;

1
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -300,7 +300,6 @@ public class SettingsGateway {
// Home page > Network & Internet // Home page > Network & Internet
Settings.WifiSettingsActivity.class.getName(), Settings.WifiSettingsActivity.class.getName(),
Settings.DataUsageSummaryActivity.class.getName(), Settings.DataUsageSummaryActivity.class.getName(),
Settings.SimSettingsActivity.class.getName(),
// Home page > Connected devices // Home page > Connected devices
Settings.BluetoothSettingsActivity.class.getName(), Settings.BluetoothSettingsActivity.class.getName(),
Settings.WifiDisplaySettingsActivity.class.getName(), Settings.WifiDisplaySettingsActivity.class.getName(),