Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e12bd4d1: am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev

Browse Source 
* commit 'e12bd4d1c3cb9b0ff852c13f33efc49b3229da5c':
  QS: Repoint Wifi + BT dual tile labels to settings.
This commit is contained in:
John Spurlock
2014-08-22 13:39:43 +00:00
committed by Android Git Automerger
parent b920f8f453 d3ca9165d2
commit 25adf47efb
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
View File

@@ -104,7 +104,6 @@ public class QSTileView extends ViewGroup {
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);

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

@@ -77,7 +77,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> {
@Override
protected void handleSecondaryClick() {
showDetail(true);
mHost.startSettingsActivity(BLUETOOTH_SETTINGS);
}
@Override

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

@@ -87,11 +87,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
@Override
protected void handleSecondaryClick() {
if (!mState.enabled) {
mController.setWifiEnabled(true);
mState.enabled = true;
}
showDetail(true);
mHost.startSettingsActivity(WIFI_SETTINGS);
}
@Override