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

Commit 2474b3f2 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge \\"QS: Make BT detail be more consistent with Settings\\" into nyc-mr1-dev am: c357decc 

am: bdaa4a84

Change-Id: I0d8cfea779411dfb7652f2fc5491991521554db1
parents d0e4dce4 bdaa4a84

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

+3 −0
Original line number Diff line number Diff line
@@ -265,6 +265,9 @@ public class QSDetail extends LinearLayout { 
            return;

        }

        mQsDetailHeaderSwitch.setChecked(state);

        final boolean toggleEnabled = mDetailAdapter != null && mDetailAdapter.getToggleEnabled();

        mQsDetailHeader.setEnabled(toggleEnabled);

        mQsDetailHeaderSwitch.setEnabled(toggleEnabled);

    }



    private void handleScanStateChanged(boolean state) {

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

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ public abstract class QSTile<TState extends State> { 
    public interface DetailAdapter {

        CharSequence getTitle();

        Boolean getToggleState();

        default boolean getToggleEnabled() {

            return true;

        }

        View createDetailView(Context context, View convertView, ViewGroup parent);

        Intent getSettingsIntent();

        void setToggleState(boolean state);

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.qs.tiles;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.content.Context;
@@ -212,6 +213,12 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState> { 
            return mState.value;

        }



        @Override

        public boolean getToggleEnabled() {

            return mController.getBluetoothState() == BluetoothAdapter.STATE_OFF

                    || mController.getBluetoothState() == BluetoothAdapter.STATE_ON;

        }



        @Override

        public Intent getSettingsIntent() {

            return BLUETOOTH_SETTINGS;

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ public interface BluetoothController { 


    boolean isBluetoothSupported();

    boolean isBluetoothEnabled();



    int getBluetoothState();



    boolean isBluetoothConnected();

    boolean isBluetoothConnecting();

    String getLastDeviceName();

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

+9 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 
    private CachedBluetoothDevice mLastDevice;



    private final H mHandler = new H();

    private int mState;



    public BluetoothControllerImpl(Context context, Looper bgLooper) {

        mLocalBluetoothManager = LocalBluetoothManager.getInstance(context, null);
@@ -119,6 +120,11 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 
        return mEnabled;

    }



    @Override

    public int getBluetoothState() {

        return mState;

    }



    @Override

    public boolean isBluetoothConnected() {

        return mConnectionState == BluetoothAdapter.STATE_CONNECTED;
@@ -192,7 +198,9 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 


    @Override

    public void onBluetoothStateChanged(int bluetoothState) {

        mEnabled = bluetoothState == BluetoothAdapter.STATE_ON;

        mEnabled = bluetoothState == BluetoothAdapter.STATE_ON

                || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;

        mState = bluetoothState;

        mHandler.sendEmptyMessage(H.MSG_STATE_CHANGED);

    }