commit b5647c5720ab65a72de7744fb1e7ec7e6dec0b12
author Daisuke Miyakawa <dmiyakawa@google.com> Fri Sep 10 18:04:02 2010 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Wed Sep 15 16:48:25 2010 -0700
tree 000b9ae581cac4b20eb2b522af86f9772f004c88
parent 1b31dc029daacfb21cbb288ede39dd9aa9213190

Fragmentize VpnSettings and relevant Activities.

Add startFragment() to SettingsFragmentPreference.

Change-Id: Ifab93b2e68892d5f6da559f337c94d62629780c8

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 42c076b..130674e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,10 +197,10 @@
             </intent-filter>
         </activity-alias>
 
-        <activity android:name=".vpn.VpnSettings"
-                android:label="@string/vpn_settings_title"
+        <activity-alias android:name=".vpn.VpnSettings"
                 android:configChanges="orientation|keyboardHidden"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:targetActivity="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.vpn.SETTINGS" />
@@ -208,14 +208,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
-        </activity>
-
-        <activity android:name=".vpn.VpnTypeSelection"
-                android:configChanges="orientation|keyboardHidden">
-        </activity>
-        <activity android:name=".vpn.VpnEditor"
-                android:configChanges="orientation|keyboardHidden">
-        </activity>
+        </activity-alias>
 
         <activity-alias android:name="DateTimeSettings"
                 android:label="@string/date_and_time"