summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/qs
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-01-14 10:13:22 -0500
committerJason Monk <jmonk@google.com>2015-01-21 20:58:47 +0000
commit17f3c3f4fb3845cf933fe82495b914112e819fb4 (patch)
treef008b4ef975a8b01e73dcd01637159cc56e8d925 /packages/SystemUI/src/com/android/systemui/qs
parent213269599bdec3d83d3d811f5e8f62b9fd8d245c (diff)
downloadframeworks_base-17f3c3f4fb3845cf933fe82495b914112e819fb4.zip
frameworks_base-17f3c3f4fb3845cf933fe82495b914112e819fb4.tar.gz
frameworks_base-17f3c3f4fb3845cf933fe82495b914112e819fb4.tar.bz2
Show connect dialog when selecting secure QS wifi
Use startSettingsActivity (QSTileHost) to make sure we use the right flags and get the keyguard out of the way so the user always sees the connect dialog for secure networks when they are sent to settings. Bug: 18987307 Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index a920624..e09024b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -30,6 +30,7 @@ import com.android.systemui.qs.QSDetailItems.Item;
import com.android.systemui.qs.QSTile;
import com.android.systemui.qs.QSTileView;
import com.android.systemui.qs.SignalTileView;
+import com.android.systemui.statusbar.phone.QSTileHost;
import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.NetworkController.AccessPointController;
import com.android.systemui.statusbar.policy.NetworkController.AccessPointController.AccessPoint;
@@ -290,6 +291,11 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
}
@Override
+ public void onSettingsActivityTriggered(Intent settingsIntent) {
+ mHost.startSettingsActivity(settingsIntent);
+ }
+
+ @Override
public void onDetailItemClick(Item item) {
if (item == null || item.tag == null) return;
final AccessPoint ap = (AccessPoint) item.tag;