diff options
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 20f43c9..03978cc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -115,9 +115,8 @@ <intent-filter> <action android:name="android.intent.action.MAIN" /> <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.VOICE_LAUNCH" /> </intent-filter> </activity> diff --git a/res/values/strings.xml b/res/values/strings.xml index c19f833..c6c3a2c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1800,5 +1800,5 @@ found in the list of installed applications.</string> <string name="vpn_settings_category">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 & manage VPN configurations, connections</string> </resources> diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index cb37465..ccf360a 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -163,12 +163,12 @@ public class SecuritySettings extends PreferenceActivity { PreferenceScreen vpnPreferences = getPreferenceManager() .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()); PreferenceCategory vpnCat = new PreferenceCategory(this); - vpnCat.setTitle(R.string.vpn_settings_title); - vpnCat.setSummary(R.string.vpn_settings_summary); + vpnCat.setTitle(R.string.vpn_settings_category); root.addPreference(vpnCat); vpnCat.addPreference(vpnPreferences); |