Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cd26fa4 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents bd60d7f5 7a605e82

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

+0 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { 


    @Override

    protected void handleSecondaryClick() {

        showDetail(true);

        mHost.startSettingsActivity(BLUETOOTH_SETTINGS);

    }



    @Override

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

+1 −5
Original line number Diff line number Diff line
@@ -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