Get Tile#intent through getter (3506b746) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -723,7 +723,8 @@ public class SettingsActivity extends SettingsBaseActivity
		for (DashboardCategory category : categories) {
		final int tileCount = category.getTilesCount();
		for (int i = 0; i < tileCount; i++) {
		final ComponentName component = category.getTile(i).intent.getComponent();
		final ComponentName component = category.getTile(i)
		.getIntent().getComponent();
		final String name = component.getClassName();
		final boolean isEnabledForRestricted = ArrayUtils.contains(
		SettingsGateway.SETTINGS_FOR_RESTRICTED, name);

src/com/android/settings/accounts/AccountDetailDashboardFragment.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@ import android.os.Bundle;
		import android.os.UserHandle;
		import android.os.UserManager;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.PreferenceScreen;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.Utils;
		@@ -33,9 +36,6 @@ import com.android.settingslib.drawer.Tile;
		import java.util.ArrayList;
		import java.util.List;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.PreferenceScreen;

		public class AccountDetailDashboardFragment extends DashboardFragment {

		private static final String TAG = "AccountDetailDashboard";
		@@ -131,8 +131,8 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
		return false;
		}
		final boolean display = mAccountType.equals(metadata.getString(METADATA_IA_ACCOUNT));
		if (display && tile.intent != null) {
		tile.intent.putExtra(EXTRA_ACCOUNT_NAME, mAccount.name);
		if (display) {
		tile.getIntent().putExtra(EXTRA_ACCOUNT_NAME, mAccount.name);
		}
		return display;
		}

src/com/android/settings/dashboard/CategoryManager.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class CategoryManager {
		DashboardCategory category = mCategories.get(i);
		for (int j = 0; j < category.getTilesCount(); j++) {
		Tile tile = category.getTile(j);
		if (tileBlacklist.contains(tile.intent.getComponent())) {
		if (tileBlacklist.contains(tile.getIntent().getComponent())) {
		category.removeTile(j--);
		}
		}
		@@ -205,10 +205,7 @@ public class CategoryManager {
		final Set<ComponentName> components = new ArraySet<>();
		for (int i = count - 1; i >= 0; i--) {
		final Tile tile = category.getTile(i);
		if (tile.intent == null) {
		continue;
		}
		final ComponentName tileComponent = tile.intent.getComponent();
		final ComponentName tileComponent = tile.getIntent().getComponent();
		if (components.contains(tileComponent)) {
		category.removeTile(i);
		} else {

src/com/android/settings/dashboard/DashboardAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
		}
		}
		} catch (PackageManager.NameNotFoundException e) {
		Log.e(TAG, "Failed to set background color for " + tile.intent.getPackage());
		Log.e(TAG, "Failed to set background color for " + tile.getPackageName());
		}
		mCache.updateIcon(tileIcon, icon);
		}

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

+12 −21

Original line number	Diff line number	Diff line
		@@ -117,14 +117,14 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {

		@Override
		public String getDashboardKeyForTile(Tile tile) {
		if (tile == null \|\| tile.intent == null) {
		if (tile == null) {
		return null;
		}
		if (!TextUtils.isEmpty(tile.key)) {
		return tile.key;
		}
		final StringBuilder sb = new StringBuilder(DASHBOARD_TILE_PREF_KEY_PREFIX);
		final ComponentName component = tile.intent.getComponent();
		final ComponentName component = tile.getIntent().getComponent();
		sb.append(component.getClassName());
		return sb.toString();
		}
		@@ -157,8 +157,8 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		}
		if (!TextUtils.isEmpty(clsName)) {
		pref.setFragment(clsName);
		} else if (tile.intent != null) {
		final Intent intent = new Intent(tile.intent);
		} else {
		final Intent intent = new Intent(tile.getIntent());
		intent.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
		sourceMetricsCategory);
		if (action != null) {
		@@ -178,11 +178,8 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		order = -tile.priority;
		}
		if (order != null) {
		boolean shouldSkipBaseOrderOffset = false;
		if (tile.intent != null) {
		shouldSkipBaseOrderOffset = TextUtils.equals(
		skipOffsetPackageName, tile.intent.getComponent().getPackageName());
		}
		boolean shouldSkipBaseOrderOffset = TextUtils.equals(
		skipOffsetPackageName, tile.getIntent().getComponent().getPackageName());
		if (shouldSkipBaseOrderOffset \|\| baseOrder == Preference.DEFAULT_ORDER) {
		pref.setOrder(order);
		} else {
		@@ -204,11 +201,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		mContext.startActivity(intent);
		return;
		}

		if (tile.intent == null) {
		return;
		}
		final Intent intent = new Intent(tile.intent)
		final Intent intent = new Intent(tile.getIntent())
		.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
		MetricsEvent.DASHBOARD_SUMMARY)
		.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
		@@ -244,15 +237,13 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
		} else if (tile.getMetaData() != null
		&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {
		ThreadUtils.postOnBackgroundThread(() -> {
		final Intent intent = tile.getIntent();
		String packageName = null;
		if (tile.intent != null) {
		Intent intent = tile.intent;
		if (!TextUtils.isEmpty(intent.getPackage())) {
		packageName = intent.getPackage();
		} else if (intent.getComponent() != null) {
		packageName = intent.getComponent().getPackageName();
		}
		}
		final Map<String, IContentProvider> providerMap = new ArrayMap<>();
		final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_ICON_URI);
		final Pair<String, Integer> iconInfo = TileUtils.getIconFromUri(