Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev

am: 6dfafa5d95

Change-Id: I9f17e8f5f3ffe084567c7be7743cc7b62a4e482d
This commit is contained in:
Fan Zhang
2017-06-19 23:33:13 +00:00
committed by android-build-merger
2 changed files with 6 additions and 0 deletions

View File

@@ -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>

View File

@@ -287,6 +287,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
getContext().unregisterReceiver(mSimStateReceiver);
}
@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