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

am 82988b48: Merge "Add Help lin to Settings > Security" into jb-mr1-dev

Browse Source 
* commit '82988b4871bd318d16aeb13947c7388eb1c5f195':
  Add Help lin to Settings > Security
This commit is contained in:
rich cannings
2012-09-30 15:51:24 -07:00
committed by Android Git Automerger
parent 1035e19941 82988b4871
commit e88c4bab2e
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4384,6 +4384,8 @@
<string name="help_url_users" translatable="false"></string> <string name="help_url_users" translatable="false"></string>
<!-- Help URL, Location access [DO NOT TRANSLATE] --> <!-- Help URL, Location access [DO NOT TRANSLATE] -->
<string name="help_url_location_access" translatable="false"></string> <string name="help_url_location_access" translatable="false"></string>
<!-- Help URL, Security settings [DO NOT TRANSLATE] -->
<string name="help_url_security" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] --> <!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string> <string name="user_account_title">Account for content</string>

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

@@ -727,6 +727,11 @@ public class SecuritySettings extends SettingsPreferenceFragment
return true; return true;
} }
@Override
protected int getHelpResource() {
return R.string.help_url_security;
}
public void startBiometricWeakImprove(){ public void startBiometricWeakImprove(){
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup"); intent.setClassName("com.android.facelock", "com.android.facelock.AddToSetup");

3
src/com/android/settings/Settings.java
View File

@@ -364,7 +364,8 @@ public class Settings extends PreferenceActivity
SoundSettings.class.getName().equals(fragmentName) || SoundSettings.class.getName().equals(fragmentName) ||
PrivacySettings.class.getName().equals(fragmentName) || PrivacySettings.class.getName().equals(fragmentName) ||
ManageAccountsSettings.class.getName().equals(fragmentName) || ManageAccountsSettings.class.getName().equals(fragmentName) ||
VpnSettings.class.getName().equals(fragmentName)) { VpnSettings.class.getName().equals(fragmentName) ||
SecuritySettings.class.getName().equals(fragmentName)) {
intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true); intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
} }