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

Commit 120107b0 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "SystemUI: Show mic-less headphone icon in status bar (1/2)" into gingerbread

parents 151b2999 12e078e2

packages/SystemUI/res/drawable-hdpi/stat_sys_headset_no_mic.png

0 → 100644
+3.14 KiB
Loading image diff...

packages/SystemUI/res/drawable-mdpi/stat_sys_headset_no_mic.png

0 → 100644
+2.98 KiB
Loading image diff...

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java

+14 −2
Original line number Diff line number Diff line
@@ -562,8 +562,7 @@ public class StatusBarPolicy { 
                updateVolume();

            }

            else if (action.equals(Intent.ACTION_HEADSET_PLUG)) {

                int state = intent.getIntExtra("state", 0);

                mService.setIconVisibility("headset", (state == 1));

                updateHeadset(intent);

            }

            else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {

                updateSimState(intent);
@@ -1368,6 +1367,19 @@ public class StatusBarPolicy { 
        }

    }



    private final void updateHeadset(Intent intent) {

        final boolean isConnected = intent.getIntExtra("state", 0) == 1;



        if (isConnected) {

            final boolean hasMicrophone = intent.getIntExtra("microphone", 1) == 1;

            final int iconId = hasMicrophone

                    ? com.android.internal.R.drawable.stat_sys_headset

                    : R.drawable.stat_sys_headset_no_mic;

            mService.setIcon("headset", iconId, 0);

        }

        mService.setIconVisibility("headset", isConnected);

    }



    private final void updateBluetooth(Intent intent) {

        int iconId = R.drawable.stat_sys_data_bluetooth;

        String action = intent.getAction();