| commit | 2cd26fa48a55432d8573b3d775b7ddb5d06a3e70 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Fri Aug 22 13:27:46 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 22 13:27:47 2014 +0000 |
| tree | 0d769decb23f9db0a4375b602a9c87f57b0bc2ed | |
| parent | bd60d7f568714e09fee92e823934944f9194725e [diff] | |
| parent | 7a605e821c3b18cbe2273a9baabe757a36e8e762 [diff] |
Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev
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);
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
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