Fix talkback issue on bar chart

We set content description on icon view,
so this is why talkback speaks the permission name twice.

Test: open talkback, and click bar chart.
Fixes: 130842756
Change-Id: I2ed4916de0a249f61d97dc00fa95193560b3d74c
This commit is contained in:
tmfang
2019-04-24 16:59:59 +08:00
parent 0cab8dc0db
commit 7007e7947e

View File

@@ -18,6 +18,7 @@ package com.android.settingslib.widget;
import android.content.Context;
import android.content.res.TypedArray;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -73,7 +74,12 @@ public class BarView extends LinearLayout {
mIcon.setImageDrawable(barViewInfo.getIcon());
mBarTitle.setText(barViewInfo.getTitle());
mBarSummary.setText(barViewInfo.getSummary());
mIcon.setContentDescription(barViewInfo.getContentDescription());
final CharSequence barViewInfoContent = barViewInfo.getContentDescription();
if (!TextUtils.isEmpty(barViewInfoContent)
&& !TextUtils.equals((barViewInfo.getTitle()), barViewInfoContent)) {
mIcon.setContentDescription(barViewInfo.getContentDescription());
}
}
@VisibleForTesting