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

Commit 8681c044 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix accessibility announcement for QS details" into lmp-dev

parents bdc07b69 6783bef9

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.TypedValue; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;

import android.widget.ImageView;

import android.widget.TextView;
@@ -360,6 +361,7 @@ public class QSPanel extends ViewGroup { 
            listener = mTeardownDetailWhenDone;

            fireScanStateChanged(false);

        }

        sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

        fireShowingDetail(show ? detailAdapter : null);

        mClipper.animateCircularClip(x, y, show, listener);

    }

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

+1 −3
Original line number Diff line number Diff line
@@ -751,9 +751,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL 
            transition(mQsDetailHeader, showingDetail);

            mShowingDetail = showingDetail;

            if (showingDetail) {

                String title = mContext.getString(detail.getTitle());

                mQsDetailHeaderTitle.setText(title);

                announceForAccessibility(title);

                mQsDetailHeaderTitle.setText(detail.getTitle());

                final Boolean toggleState = detail.getToggleState();

                if (toggleState == null) {

                    mQsDetailHeaderSwitch.setVisibility(INVISIBLE);