Merge "Network Operator" into "Mobile network" main activity.
Re-write "Network Operator" setting section. Now auto and manual
network select buttons are SwitchPreference and ListPreference
respectively. They are moret tightly coupled and merged into
"Mobile network" main fragment.
Network select button is now a customized ListPreference, which
start network query when clicked, and show query result as list
of networks to choose from.
Test: manual
Bug: 62200802
Change-Id: I8dd796462e14eb6272371bfcc580ad94d199bb67
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4045ff2..87798ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -337,6 +337,7 @@
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" />
+ <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
<action android:name="android.settings.DATA_ROAMING_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -349,17 +350,6 @@
<!-- service to handle network query requests sent to RIL -->
<service android:name="NetworkQueryService" />
- <activity android:name="NetworkSetting"
- android:label="@string/networks"
- android:configChanges="orientation|screenSize|keyboardHidden"
- android:theme="@style/NetworkOperatorsSettingsTheme">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
-
<activity android:name="GsmUmtsCallOptions"
android:label="@string/gsm_umts_options"
android:theme="@style/DialerSettingsLight">