commit 21c1abcef77b6db18590215b6f7bc8e6dfda28bf
author Daisuke Miyakawa <dmiyakawa@google.com> Sun Sep 12 15:42:56 2010 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> Sun Sep 12 17:43:10 2010 -0700
tree 7c3ecfa35bd07a52f6b430ae9b9dae53e2d2ac45
parent 2712fb5d7992c78425a4845ffb23853de30f3a2a

Fragmentize ProxySettings.

Change-Id: I2c962726b0adc8811c18dd6df7ff7bdc93c31a07

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b6a422e..0a73131 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -749,13 +749,15 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ProxySelector" android:label="@string/proxy_settings_label">
+        <activity-alias android:name="ProxySelector"
+            android:label="@string/proxy_settings_label"
+            android:targetActivity="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
         <!-- TODO: Is this needed? -->
         <activity android:name="BandMode"