Merge "Talkback speaks "work" for work profile app" into rvc-dev

This commit is contained in:
Tsung-Mao Fang
2020-05-08 05:36:50 +00:00
committed by Android (Google) Code Review

View File

@@ -119,6 +119,7 @@ import com.android.settings.widget.LoadingViewController;
import com.android.settings.wifi.AppStateChangeWifiStateBridge; import com.android.settings.wifi.AppStateChangeWifiStateBridge;
import com.android.settings.wifi.ChangeWifiStateDetails; import com.android.settings.wifi.ChangeWifiStateDetails;
import com.android.settingslib.HelpUtils; import com.android.settingslib.HelpUtils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter; import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -1461,6 +1462,11 @@ public class ManageApplications extends InstrumentedFragment
ApplicationsState.AppEntry entry = mEntries.get(position); ApplicationsState.AppEntry entry = mEntries.get(position);
synchronized (entry) { synchronized (entry) {
holder.setTitle(entry.label); holder.setTitle(entry.label);
holder.itemView.setContentDescription(
AppUtils.getAppContentDescription(
mContext,
entry.info.packageName,
UserHandle.getUserId(entry.info.uid)));
holder.setIcon(Utils.getBadgedIcon(mContext, entry.info)); holder.setIcon(Utils.getBadgedIcon(mContext, entry.info));
updateSummary(holder, entry); updateSummary(holder, entry);
updateSwitch(holder, entry); updateSwitch(holder, entry);