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

Commit 60243e68 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove custom tintable check. 

Make a bunch keys private in tile and DashboardCategory
Bug: 77600770
Test: robotests
Change-Id: I4693e6bb71bd50cc664f578c7f8e25e67da20b67
parent eda8a01c

src/com/android/settings/SettingsActivity.java

+10 −10
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ import android.view.ViewGroup; 
import android.widget.Button;

import android.widget.Toolbar;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceManager;



import com.android.internal.util.ArrayUtils;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;
@@ -65,16 +75,6 @@ import com.android.settingslib.utils.ThreadUtils; 
import java.util.ArrayList;

import java.util.List;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.preference.Preference;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceManager;





public class SettingsActivity extends SettingsBaseActivity

        implements PreferenceManager.OnPreferenceTreeClickListener,

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
        if (mAccountType == null) {

            return false;

        }

        final Bundle metadata = tile.metaData;

        final Bundle metadata = tile.getMetaData();

        if (metadata == null) {

            return false;

        }

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

+5 −4
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class CategoryManager { 
            boolean useNewKey = false;

            boolean useOldKey = false;

            for (Tile tile : tiles) {

                if (CategoryKey.KEY_COMPAT_MAP.containsKey(tile.category)) {

                if (CategoryKey.KEY_COMPAT_MAP.containsKey(tile.getCategory())) {

                    useOldKey = true;

                } else {

                    useNewKey = true;
@@ -163,12 +163,13 @@ public class CategoryManager { 
            // Uses only old key, map them to new keys one by one.

            if (useOldKey && !useNewKey) {

                for (Tile tile : tiles) {

                    final String newCategoryKey = CategoryKey.KEY_COMPAT_MAP.get(tile.category);

                    tile.category = newCategoryKey;

                    final String newCategoryKey =

                            CategoryKey.KEY_COMPAT_MAP.get(tile.getCategory());

                    tile.setCategory(newCategoryKey);

                    // move tile to new category.

                    DashboardCategory newCategory = categoryByKeyMap.get(newCategoryKey);

                    if (newCategory == null) {

                        newCategory = new DashboardCategory();

                        newCategory = new DashboardCategory(newCategoryKey);

                        categoryByKeyMap.put(newCategoryKey, newCategory);

                    }

                    newCategory.addTile(tile);

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

+3 −2
Original line number Diff line number Diff line
@@ -321,8 +321,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash 
                && !(icon instanceof RoundedHomepageIcon)) {

            icon = new RoundedHomepageIcon(mContext, icon);

            try {

                if (tile.metaData != null) {

                    final int colorRes = tile.metaData.getInt(

                final Bundle metaData = tile.getMetaData();

                if (metaData != null) {

                    final int colorRes = metaData.getInt(

                            TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_HINT, 0 /* default */);

                    if (colorRes != 0) {

                        final int bgColor = mContext.getPackageManager()

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

+7 −7
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
        }

        bindSummary(pref, tile);

        bindIcon(pref, tile);

        final Bundle metadata = tile.metaData;

        final Bundle metadata = tile.getMetaData();

        String clsName = null;

        String action = null;

        Integer order = null;
@@ -218,15 +218,15 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
    private void bindSummary(Preference preference, Tile tile) {

        if (tile.summary != null) {

            preference.setSummary(tile.summary);

        } else if (tile.metaData != null

                && tile.metaData.containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {

        } else if (tile.getMetaData() != null

                && tile.getMetaData().containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {

            // Set a placeholder summary before  starting to fetch real summary, this is necessary

            // to avoid preference height change.

            preference.setSummary(R.string.summary_placeholder);



            ThreadUtils.postOnBackgroundThread(() -> {

                final Map<String, IContentProvider> providerMap = new ArrayMap<>();

                final String uri = tile.metaData.getString(META_DATA_PREFERENCE_SUMMARY_URI);

                final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_SUMMARY_URI);

                final String summary = TileUtils.getTextFromUri(

                        mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);

                ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));
@@ -241,8 +241,8 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
        final Icon tileIcon = tile.getIcon(mContext);

        if (tileIcon != null) {

            preference.setIcon(tileIcon.loadDrawable(preference.getContext()));

        } else if (tile.metaData != null

                && tile.metaData.containsKey(META_DATA_PREFERENCE_ICON_URI)) {

        } else if (tile.getMetaData() != null

                && tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {

            ThreadUtils.postOnBackgroundThread(() -> {

                String packageName = null;

                if (tile.intent != null) {
@@ -254,7 +254,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { 
                    }

                }

                final Map<String, IContentProvider> providerMap = new ArrayMap<>();

                final String uri = tile.metaData.getString(META_DATA_PREFERENCE_ICON_URI);

                final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_ICON_URI);

                final Pair<String, Integer> iconInfo = TileUtils.getIconFromUri(

                        mContext, packageName, uri, providerMap);

                if (iconInfo == null) {