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

Merge "Support getDynamicSummary in BasePreferenceController"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-05 00:02:48 +00:00
committed by Android (Google) Code Review
parent efac313a9b c69f73f4d1
commit 2c3c8c8537
14 changed files with 94 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/HeaderPreferenceController.java
View File

@@ -77,7 +77,8 @@ public class HeaderPreferenceController extends NotificationPreferenceController
: mAppRow.label;
}
CharSequence getSummary() {
@Override
public String getSummary() {
if (mChannel != null) {
if (mChannelGroup != null && mChannelGroup.getGroup() != null
&& !TextUtils.isEmpty(mChannelGroup.getGroup().getName())) {
@@ -87,12 +88,12 @@ public class HeaderPreferenceController extends NotificationPreferenceController
summary.append(bidi.unicodeWrap(mContext.getText(
R.string.notification_header_divider_symbol_with_spaces)));
summary.append(bidi.unicodeWrap(mChannelGroup.getGroup().getName().toString()));
return summary;
return summary.toString();
} else {
return mAppRow.label;
return mAppRow.label.toString();
}
} else if (mChannelGroup != null && mChannelGroup.getGroup() != null) {
return mAppRow.label;
return mAppRow.label.toString();
} else {
return "";
}