commit 7a605e821c3b18cbe2273a9baabe757a36e8e762
author John Spurlock <jspurlock@google.com> Thu Aug 21 17:37:54 2014 -0400
committer John Spurlock <jspurlock@google.com> Thu Aug 21 17:37:54 2014 -0400
tree 4e81c49cad009ff1e916ac8f7db8833b23b5fb37
parent 0df011725ce254c39cf2b83e337247f439c99f82

QS: Repoint Wifi + BT dual tile labels to settings.

Bug:17179601
Change-Id: I7854ac04be60ff2dedb29d451e98b6c0d9cce46e

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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
index 2cc1f07..987141a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
@@ -104,7 +104,6 @@
             mDualLabel = new QSDualTileLabel(mContext);
             mDualLabel.setId(android.R.id.title);
             mDualLabel.setBackgroundResource(R.drawable.btn_borderless_rect);
-            mDualLabel.setFirstLineCaret(res.getDrawable(R.drawable.qs_dual_tile_caret));
             mDualLabel.setTextColor(res.getColor(R.color.qs_tile_text));
             mDualLabel.setPadding(0, mDualTileVerticalPaddingPx, 0, mDualTileVerticalPaddingPx);
             mDualLabel.setTypeface(CONDENSED);

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index 63c880f..109237b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -77,7 +77,7 @@
 
     @Override
     protected void handleSecondaryClick() {
-        showDetail(true);
+        mHost.startSettingsActivity(BLUETOOTH_SETTINGS);
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

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 b12c6c1..4fc2ee4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -87,11 +87,7 @@
 
     @Override
     protected void handleSecondaryClick() {
-        if (!mState.enabled) {
-            mController.setWifiEnabled(true);
-            mState.enabled = true;
-        }
-        showDetail(true);
+        mHost.startSettingsActivity(WIFI_SETTINGS);
     }
 
     @Override