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

VPN settings: add missing string resource

Browse Source 
am: 1b5015cae6

Change-Id: I02c4ebe3d03cf4cd10c7d7803532433d519ff4e2
This commit is contained in:
Charles He
2017-04-01 20:47:57 +00:00
committed by android-build-merger
parent 9f7308baad 1b5015cae6
commit eea0037272
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/vpn2/ManageablePreference.java
View File

@@ -87,7 +87,7 @@ public abstract class ManageablePreference extends GearPreference {
final String[] states = res.getStringArray(R.array.vpn_states);
String summary = (mState == STATE_NONE ? "" : states[mState]);
if (mIsAlwaysOn) {
final String alwaysOnString = res.getString(R.string.vpn_always_on_active);
final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);
summary = TextUtils.isEmpty(summary) ? alwaysOnString : res.getString(
R.string.join_two_unrelated_items, summary, alwaysOnString);
}