Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae4a10c1 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

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

parents 4746bc78 11f59a08

core/java/com/android/internal/app/ResolverActivity.java

+9 −5
Original line number Diff line number Diff line
@@ -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,13 +279,16 @@ 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 (!TextUtils.isEmpty(title)) {

            final TextView titleView = (TextView) findViewById(R.id.title);

            if (titleView != null) {

                titleView.setText(title);

            }

            setTitle(title);

        }



        final ImageView iconView = (ImageView) findViewById(R.id.icon);

        final DisplayResolveInfo iconInfo = mAdapter.getFilteredItem();