commit 39aa79160eb1dc89eece0aeb5ce163eb64465ffa
author Malcolm Chen <refuhoo@google.com> Mon Jun 05 19:02:16 2017 -0700
committer Malcolm Chen <refuhoo@google.com> Wed Nov 01 18:25:24 2017 -0700
tree ecfa51711a5f0b2e4c90ca1b1cc4143e6cd39912
parent 653820898e3ad9b07f9e73c49ebb36c1a1aa077d

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
Merged-In: I8dd796462e14eb6272371bfcc580ad94d199bb67

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 58a65d7..a5df742 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -339,6 +339,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>
@@ -351,17 +352,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">