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

Merge "Correctly populate title for ResolverActivity" into lmp-dev

Browse Source
This commit is contained in:
Adam Powell
2014-08-20 20:27:00 +00:00
committed by Android (Google) Code Review
parent 4746bc78ec 11f59a0899
commit ae4a10c17f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -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);