Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Treat empty strings similar to null-strings when composing the subtitle in the SelectPrinterActivity."

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-01-21 16:06:45 +00:00
committed by Android (Google) Code Review
parent 5b012d4654 5462e88c02
commit 670d54c8e3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
View File

@@ -635,9 +635,9 @@ public final class SelectPrinterActivity extends Activity {
CharSequence description = printer.getDescription();
CharSequence subtitle;
if (printServiceLabel == null) {
if (TextUtils.isEmpty(printServiceLabel)) {
subtitle = description;
} else if (description == null) {
} else if (TextUtils.isEmpty(description)) {
subtitle = printServiceLabel;
} else {
subtitle = getString(R.string.printer_extended_description_template,