Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 32c3483..78a30ca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6233,6 +6233,7 @@
<string name="help_url_system_dashboard" translatable="false"></string>
<string name="help_url_double_tap_screen" translatable="false"></string>
<string name="help_url_account_detail" translatable="false"></string>
+ <string name="help_url_icc_lock" translatable="false"></string>
<!-- User account title [CHAR LIMIT=30] -->
<string name="user_account_title">Account for content</string>
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index d7de8fb..3e139e1 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -288,6 +288,11 @@
}
@Override
+ protected int getHelpResource() {
+ return R.string.help_url_icc_lock;
+ }
+
+ @Override
public void onSaveInstanceState(Bundle out) {
// Need to store this state for slider open/close
// There is one case where the dialog is popped up by the preference