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

This commit is contained in:
Jason Monk
2014-09-24 14:50:03 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -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);
}

View File

@@ -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);