diff options
| author | Adam Powell <adamp@google.com> | 2014-08-20 20:27:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 22:53:25 +0000 |
| commit | ae4a10c17fd8972ac583292e3254790c30feffc2 (patch) | |
| tree | d5b2a09ec8bdfca234ea5937650c437612db7fb1 /core/java/com | |
| parent | 4746bc78ec242c29171a1963c4f3f9cac73f2084 (diff) | |
| parent | 11f59a08994d24991980887501e3c04f21a93325 (diff) | |
| download | frameworks_base-ae4a10c17fd8972ac583292e3254790c30feffc2.zip frameworks_base-ae4a10c17fd8972ac583292e3254790c30feffc2.tar.gz frameworks_base-ae4a10c17fd8972ac583292e3254790c30feffc2.tar.bz2 | |
Merge "Correctly populate title for ResolverActivity" into lmp-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 14 |
1 files 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 636c712..61b4567 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); |