PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show only 1 entry for hearing aid devices without killing the activity." into pi-dev am: d87acaf3cf

Browse Source 
am: 595cda2d14

Change-Id: I49973a65a31f5f79722c4e4841f2dcda34128edb
This commit is contained in:
Isha Bobra
2018-04-16 10:03:34 -07:00
committed by android-build-merger
parent a8000ddd9b 595cda2d14
commit ea72074ed7
9 changed files with 88 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -85,6 +85,8 @@ public class EntityHeaderController {
private String mIconContentDescription;
private CharSequence mLabel;
private CharSequence mSummary;
// Required for hearing aid devices.
private CharSequence mSecondSummary;
private String mPackageName;
private Intent mAppNotifPrefIntent;
@UserIdInt
@@ -181,6 +183,18 @@ public class EntityHeaderController {
return this;
}
public EntityHeaderController setSecondSummary(CharSequence summary) {
mSecondSummary = summary;
return this;
}
public EntityHeaderController setSecondSummary(PackageInfo packageInfo) {
if (packageInfo != null) {
mSummary = packageInfo.versionName;
}
return this;
}
public EntityHeaderController setHasAppInfoLink(boolean hasAppInfoLink) {
mHasAppInfoLink = hasAppInfoLink;
return this;
@@ -242,6 +256,7 @@ public class EntityHeaderController {
}
setText(R.id.entity_header_title, mLabel);
setText(R.id.entity_header_summary, mSummary);
setText(R.id.entity_header_second_summary, mSecondSummary);
if (mIsInstantApp) {
setText(R.id.install_type,
mHeader.getResources().getString(R.string.install_type_instant));