Merge "Set summary if VPN is AlwaysOn Type" into sc-dev

This commit is contained in:
Jeremy Goldman
2021-05-05 01:06:01 +00:00
committed by Android (Google) Code Review

View File

@@ -121,6 +121,7 @@ public abstract class ManageablePreference extends GearPreference {
final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active); final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);
summary = TextUtils.isEmpty(summary) ? alwaysOnString : summary + " / " summary = TextUtils.isEmpty(summary) ? alwaysOnString : summary + " / "
+ alwaysOnString; + alwaysOnString;
setSummary(summary);
} else { } else {
setSummary(summary); setSummary(summary);
} }