diff options
| author | Jeff Davidson <jpd@google.com> | 2014-08-20 23:59:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-20 21:47:20 +0000 |
| commit | c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d (patch) | |
| tree | df05f583efad90e73fb6aefd0a6401134926eb8d /packages/SystemUI/src/com/android/systemui/qs/QSFooter.java | |
| parent | 3f38f72a1b629f8887787415129615c506f89621 (diff) | |
| parent | 05542603dd4f1e0ea47a3dca01de3999a9a329a9 (diff) | |
| download | frameworks_base-c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d.zip frameworks_base-c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d.tar.gz frameworks_base-c8f0ffa297d1d5d51c6fa60e7d7cd56a8bc91d1d.tar.bz2 | |
Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs/QSFooter.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooter.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index bfbc56c..a8199fa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -119,11 +119,7 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene @Override public void onClick(DialogInterface dialog, int which) { if (which == DialogInterface.BUTTON_NEGATIVE) { - if (mSecurityController.isLegacyVpn()) { - mSecurityController.disconnectFromLegacyVpn(); - } else { - mSecurityController.openVpnApp(); - } + mSecurityController.disconnectFromVpn(); } } @@ -142,7 +138,7 @@ public class QSFooter implements OnClickListener, DialogInterface.OnClickListene if (mSecurityController.isLegacyVpn()) { return mContext.getString(R.string.disconnect_vpn); } else { - return mContext.getString(R.string.open_app); + return mContext.getString(R.string.disable_vpn); } } |