diff options
| author | Wink Saville <> | 2009-04-02 01:37:03 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-02 01:37:03 -0700 |
| commit | f9e024198d3b16454287888bd5d40fee23390d23 (patch) | |
| tree | 111fcc6911cc13c20c271ce793b7124a55fba0dd /AndroidManifest.xml | |
| parent | b20dd917e2d29045225985baa980a2a8e22e10fc (diff) | |
| download | packages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.tar.gz packages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.tar.bz2 packages_apps_Settings-f9e024198d3b16454287888bd5d40fee23390d23.zip | |
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7b3e689a6..6e3bfde7f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -240,7 +240,7 @@ </intent-filter> </activity> - <activity android:name="SimLockSettings" android:label="@string/sim_lock_settings" + <activity android:name="IccLockSettings" android:label="@string/sim_lock_settings" android:process="com.android.phone"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -442,7 +442,7 @@ </activity> <activity android:name="ProxySelector" android:label="@string/proxy_settings_label" - android:theme="@android:style/Theme.Dialog"> + android:theme="@android:style/Theme.Dialog"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" /> @@ -502,3 +502,5 @@ </manifest> + + |