From 11f59a08994d24991980887501e3c04f21a93325 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 20 Aug 2014 13:22:16 -0700 Subject: Correctly populate title for ResolverActivity This affects accessibility feedback. Bug 17147141 Change-Id: I3e90b80c2813e79e0abe1c5ddc6e0c115a6369dd --- core/java/com/android/internal/app/ResolverActivity.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 636c71229bb0..61b456705691 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -22,6 +22,7 @@ import android.app.usage.UsageStats; import android.app.usage.UsageStatsManager; import android.os.AsyncTask; import android.provider.Settings; +import android.text.TextUtils; import android.util.ArrayMap; import android.util.Slog; import android.widget.AbsListView; @@ -278,12 +279,15 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic }); } - final TextView titleView = (TextView) findViewById(R.id.title); - if (titleView != null) { - if (title == null) { - title = getTitleForAction(intent.getAction(), defaultTitleRes); + if (title == null) { + title = getTitleForAction(intent.getAction(), defaultTitleRes); + } + if (!TextUtils.isEmpty(title)) { + final TextView titleView = (TextView) findViewById(R.id.title); + if (titleView != null) { + titleView.setText(title); } - titleView.setText(title); + setTitle(title); } final ImageView iconView = (ImageView) findViewById(R.id.icon); -- cgit v1.2.3-59-g8ed1b