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

Commit 51d65ae8 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am d72953e8: am 614349d7: Merge "Status Bar: Include wifi/mobile state in...

am d72953e8: am 614349d7: Merge "Status Bar: Include wifi/mobile state in touch exploration" into jb-dev

* commit 'd72953e8':
  Status Bar: Include wifi/mobile state in touch exploration
parents 324d4263 d72953e8
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.util.AttributeSet;
import android.util.Slog;
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;

import com.android.systemui.statusbar.policy.NetworkController;

@@ -132,6 +132,17 @@ public class SignalClusterView
        apply();
    }

    @Override
    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
        // Standard group layout onPopulateAccessibilityEvent() implementations
        // ignore content description, so populate manually
        if (mWifiVisible && mWifiGroup.getContentDescription() != null)
            event.getText().add(mWifiGroup.getContentDescription());
        if (mMobileVisible && mMobileGroup.getContentDescription() != null)
            event.getText().add(mMobileGroup.getContentDescription());
        return super.dispatchPopulateAccessibilityEvent(event);
    }

    // Run after each indicator change.
    private void apply() {
        if (mWifiGroup == null) return;