PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LAUNCHER category from VPN settings activity's intent filter.

Browse Source 
Also add preference summary to the VPN entry in the security settings.
This commit is contained in:
Hung-ying Tyan
2009-06-14 17:53:19 +08:00
parent b315980367
commit 71e2d3bc3a
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -115,9 +115,8 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.net.vpn.SETTINGS" /> <action android:name="android.net.vpn.SETTINGS" />
<action android:name="android.net.vpn.INSTALL_PROFILE" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter> </intent-filter>
</activity> </activity>

2
res/values/strings.xml
View File

@@ -1800,5 +1800,5 @@ found in the list of installed applications.</string>
<string name="vpn_settings_category">VPN</string> <string name="vpn_settings_category">VPN</string>
<string name="vpn_settings_title">VPN</string> <string name="vpn_settings_title">VPN</string>
<string name="vpn_settings_summary">Set up and manage VPN configurations, connections</string> <string name="vpn_settings_summary">Set up &amp; manage VPN configurations, connections</string>
</resources> </resources>

6
src/com/android/settings/SecuritySettings.java
View File

@@ -163,12 +163,12 @@ public class SecuritySettings extends PreferenceActivity {
PreferenceScreen vpnPreferences = getPreferenceManager() PreferenceScreen vpnPreferences = getPreferenceManager()
.createPreferenceScreen(this); .createPreferenceScreen(this);
vpnPreferences.setTitle(R.string.vpn_settings_category); vpnPreferences.setTitle(R.string.vpn_settings_title);
vpnPreferences.setSummary(R.string.vpn_settings_summary);
vpnPreferences.setIntent(new VpnManager(this).createSettingsActivityIntent()); vpnPreferences.setIntent(new VpnManager(this).createSettingsActivityIntent());
PreferenceCategory vpnCat = new PreferenceCategory(this); PreferenceCategory vpnCat = new PreferenceCategory(this);
vpnCat.setTitle(R.string.vpn_settings_title); vpnCat.setTitle(R.string.vpn_settings_category);
vpnCat.setSummary(R.string.vpn_settings_summary);
root.addPreference(vpnCat); root.addPreference(vpnCat);
vpnCat.addPreference(vpnPreferences); vpnCat.addPreference(vpnPreferences);