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

Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev am: 6dfafa5d95

Browse Source 
am: f66702c930

Change-Id: Iaa8dde8ae93cf895001505e84907dfa60b9079f1
This commit is contained in:
Fan Zhang
2017-06-19 23:45:43 +00:00
committed by android-build-merger
parent 2611734af5 f66702c930
commit c97e9bc39d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/strings.xml
View File

@@ -6233,6 +6233,7 @@
<string name="help_url_system_dashboard" translatable="false"></string> <string name="help_url_system_dashboard" translatable="false"></string>
<string name="help_url_double_tap_screen" 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_account_detail" translatable="false"></string>
<string name="help_url_icc_lock" 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/IccLockSettings.java
View File

@@ -287,6 +287,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
getContext().unregisterReceiver(mSimStateReceiver); getContext().unregisterReceiver(mSimStateReceiver);
} }
@Override
protected int getHelpResource() {
return R.string.help_url_icc_lock;
}
@Override @Override
public void onSaveInstanceState(Bundle out) { public void onSaveInstanceState(Bundle out) {
// Need to store this state for slider open/close // Need to store this state for slider open/close