Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev

Browse Source
This commit is contained in:
Philipp Weiß
2017-01-10 13:54:25 +00:00
committed by Android (Google) Code Review
parent 971236480c d361b181e5
commit a7c6324340
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
View File

@@ -184,6 +184,9 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
profileVpn, hasProfileOwner, isBranded);
if (deviceOwnerPackage == null) {
mDialog.setMessage(msg);
if (mSecurityController.isVpnEnabled() && !mSecurityController.isVpnRestricted()) {
mDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getSettingsButton(), this);
}
} else {
View dialogView = LayoutInflater.from(mContext)
.inflate(R.layout.quick_settings_footer_dialog, null, false);
@@ -201,10 +204,12 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene
final SpannableStringBuilder message = new SpannableStringBuilder();
message.append(mContext.getString(R.string.monitoring_description_do_body_vpn,
primaryVpn));
message.append(mContext.getString(
R.string.monitoring_description_vpn_settings_separator));
message.append(mContext.getString(R.string.monitoring_description_vpn_settings),
new VpnSpan(), 0);
if (!mSecurityController.isVpnRestricted()) {
message.append(mContext.getString(
R.string.monitoring_description_vpn_settings_separator));
message.append(mContext.getString(R.string.monitoring_description_vpn_settings),
new VpnSpan(), 0);
}
TextView vpnWarning = (TextView) dialogView.findViewById(R.id.vpn_warning);
vpnWarning.setText(message);