Merge "Re-Add VPN-"Settings" button to QSFooter dialog" into nyc-mr2-dev (a7c63243) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSFooter.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -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));
		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);