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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14424438

Change-Id: I045b5709ef078367b7a646d7dec705acb5aedbcf
This commit is contained in:
Jeremy Goldman
2021-05-05 01:32:57 +00:00
committed by Automerger Merge Worker
parent 7c3659352e da602e196e
commit aa3fee0833
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/vpn2/ManageablePreference.java
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);
} }