diff options
| author | Lei Yu <jackqdyulei@google.com> | 2018-10-08 22:12:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-08 22:12:26 +0000 |
| commit | dd2908d5ce0ca101ed8b574d1090779e4a7bfdfa (patch) | |
| tree | 406fcd976409de208e49bc616492300b9458a90b /AndroidManifest.xml | |
| parent | 95d282273489c306597b8f5a96aeb323491bc3ed (diff) | |
| parent | 2c0861e61b3658155dcc5550c9ed53d56e8a48e2 (diff) | |
| download | packages_apps_Settings-dd2908d5ce0ca101ed8b574d1090779e4a7bfdfa.tar.gz packages_apps_Settings-dd2908d5ce0ca101ed8b574d1090779e4a7bfdfa.tar.bz2 packages_apps_Settings-dd2908d5ce0ca101ed8b574d1090779e4a7bfdfa.zip | |
Merge changes I3008bf85,I43aebf2e,I4fda0708,I744d5376
* changes:
Remove AdvancedOptionsPreference
Add activity for mobile network page
Fix the complie error of network migration
Copy MobileNetworkSettings to settings app
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e64a9b38b1..ec34514a9a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -131,6 +131,13 @@ android:launchMode="singleTask"> </activity> + <activity android:name=".mobilenetwork.MobileSettingsActivity" + android:label="@string/network_settings_title" + android:theme="@style/Theme.Settings.Home" + android:launchMode="singleTask"> + <!-- TODO(b/114749736): add intent filter here and disable the one in telephony --> + </activity> + <!-- Alias for launcher activity only, as this belongs to each profile. --> <activity-alias android:name="Settings" android:taskAffinity="com.android.settings.root" |