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

Commit 2ded0a3a authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 4bd63054: am 709c542b: Merge "Fixing crash in emulator due to missing... 

am 4bd63054: am 709c542b: Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev

* commit '4bd63054':
  Fixing crash in emulator due to missing bluetooth.
parents 8e1ea422 4bd63054

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java

+20 −19
Original line number Diff line number Diff line
@@ -167,10 +167,9 @@ class QuickSettings { 
        startSettingsActivity(intent);

    }

    private void startSettingsActivity(Intent intent) {

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        mBar.collapseAllPanels(true);

        mContext.startActivity(intent);



    }



    private void addUserTiles(ViewGroup parent, LayoutInflater inflater) {
@@ -310,6 +309,7 @@ class QuickSettings { 
        parent.addView(airplaneTile);



        // Bluetooth

        if (mModel.deviceSupportsBluetooth()) {

            QuickSettingsTileView bluetoothTile = (QuickSettingsTileView)

                    inflater.inflate(R.layout.quick_settings_tile, parent, false);

            bluetoothTile.setContent(R.layout.quick_settings_tile_bluetooth, inflater);
@@ -327,6 +327,7 @@ class QuickSettings { 
                }

            });

            parent.addView(bluetoothTile);

        }



        // Brightness

        QuickSettingsTileView brightnessTile = (QuickSettingsTileView)

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

+3 −0
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, 
        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        onBluetoothStateChange(adapter.isEnabled());

    }

    boolean deviceSupportsBluetooth() {

        return (BluetoothAdapter.getDefaultAdapter() != null);

    }

    // BluetoothController callback

    @Override

    public void onBluetoothStateChange(boolean on) {