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

Commit 27906ac9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topics "remove_tile_summary_cache", "remove_tile_title" 

* changes:
  Remove cached summary text. load from metadata every time.
  Remove caching for title and and getId() method.
parents fc305269 4aa6da6d

packages/SettingsLib/src/com/android/settingslib/drawer/Tile.java

+95 −19
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_PROFILE; 
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_URI;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY_URI;

import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE;

import static com.android.settingslib.drawer.TileUtils.PROFILE_ALL;

import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY;
@@ -29,16 +32,19 @@ import android.content.Intent; 
import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.graphics.drawable.Icon;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;



import java.util.ArrayList;

import java.util.Comparator;

import java.util.List;

import java.util.Objects;



/**

 * Description of a single dashboard tile that the user can select.
@@ -47,20 +53,6 @@ public class Tile implements Parcelable { 


    private static final String TAG = "Tile";



    /**

     * Title of the tile that is shown to the user.

     *

     * @attr ref android.R.styleable#PreferenceHeader_title

     */

    public CharSequence title;



    /**

     * Optional summary describing what this tile controls.

     *

     * @attr ref android.R.styleable#PreferenceHeader_summary

     */

    public CharSequence summary;



    /**

     * Optional list of user handles which the intent should be launched on.

     */
@@ -70,11 +62,13 @@ public class Tile implements Parcelable { 
     * The metaData from the activity that defines this tile.

     */

    private final Bundle mMetaData;



    private final String mActivityPackage;

    private final String mActivityName;

    private final Intent mIntent;



    private ActivityInfo mActivityInfo;

    private CharSequence mSummaryOverride;



    private String mCategory;



    public Tile(ActivityInfo activityInfo, String category) {
@@ -90,8 +84,6 @@ public class Tile implements Parcelable { 
        mActivityPackage = in.readString();

        mActivityName = in.readString();

        mIntent = new Intent().setClassName(mActivityPackage, mActivityName);

        title = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        summary = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);

        final int N = in.readInt();

        for (int i = 0; i < N; i++) {

            userHandle.add(UserHandle.CREATOR.createFromParcel(in));
@@ -109,8 +101,6 @@ public class Tile implements Parcelable { 
    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(mActivityPackage);

        dest.writeString(mActivityName);

        TextUtils.writeToParcel(title, dest, flags);

        TextUtils.writeToParcel(summary, dest, flags);

        final int N = userHandle.size();

        dest.writeInt(N);

        for (int i = 0; i < N; i++) {
@@ -120,6 +110,14 @@ public class Tile implements Parcelable { 
        dest.writeBundle(mMetaData);

    }



    public int getId() {

        return Objects.hash(mActivityPackage, mActivityName);

    }



    public String getDescription() {

        return mActivityPackage + "/" + mActivityName;

    }



    public String getPackageName() {

        return mActivityPackage;

    }
@@ -158,6 +156,84 @@ public class Tile implements Parcelable { 
                && mMetaData.get(META_DATA_KEY_ORDER) instanceof Integer;

    }



    /**

     * Title of the tile that is shown to the user.

     */

    public CharSequence getTitle(Context context) {

        CharSequence title = null;

        final PackageManager packageManager = context.getPackageManager();

        if (mMetaData.containsKey(META_DATA_PREFERENCE_TITLE)) {

            if (mMetaData.get(META_DATA_PREFERENCE_TITLE) instanceof Integer) {

                try {

                    final Resources res =

                            packageManager.getResourcesForApplication(mActivityPackage);

                    title = res.getString(mMetaData.getInt(META_DATA_PREFERENCE_TITLE));

                } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {

                    Log.d(TAG, "Couldn't find info", e);

                }

            } else {

                title = mMetaData.getString(META_DATA_PREFERENCE_TITLE);

            }

        }

        // Set the preference title to the activity's label if no

        // meta-data is found

        if (title == null) {

            title = getActivityInfo(context).loadLabel(packageManager);

        }

        return title;

    }



    /**

     * Returns the raw metadata for summary, this is used for comparing 2 summary text without

     * loading the real string.

     */

    public String getSummaryReference() {

        if (mSummaryOverride != null) {

            return mSummaryOverride.toString();

        }

        if (mMetaData != null && mMetaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {

            return mMetaData.get(META_DATA_PREFERENCE_SUMMARY).toString();

        }

        return null;

    }



    /**

     * Overrides the summary. This can happen when injected tile wants to provide dynamic summary.

     */

    public void overrideSummary(CharSequence summaryOverride) {

        mSummaryOverride = summaryOverride;

    }



    /**

     * Optional summary describing what this tile controls.

     */

    public CharSequence getSummary(Context context) {

        if (mSummaryOverride != null) {

            return mSummaryOverride;

        }

        CharSequence summary = null;

        final PackageManager packageManager = context.getPackageManager();

        if (mMetaData != null) {

            if (mMetaData.containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {

                return null;

            }

            if (mMetaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {

                if (mMetaData.get(META_DATA_PREFERENCE_SUMMARY) instanceof Integer) {

                    try {

                        final Resources res =

                                packageManager.getResourcesForApplication(mActivityPackage);

                        summary = res.getString(mMetaData.getInt(META_DATA_PREFERENCE_SUMMARY));

                    } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {

                        Log.d(TAG, "Couldn't find info", e);

                    }

                } else {

                    summary = mMetaData.getString(META_DATA_PREFERENCE_SUMMARY);

                }

            }

        }

        return summary;

    }



    public Bundle getMetaData() {

        return mMetaData;

    }

packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java

+0 −19
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ public class TileUtils { 
            if (tile == null) {

                tile = new Tile(activityInfo, categoryKey);

                updateTileData(context, tile, activityInfo, activityInfo.applicationInfo, pm);

                if (DEBUG) Log.d(LOG_TAG, "Adding tile " + tile.title);

                addedCache.put(key, tile);

            }
@@ -329,7 +328,6 @@ public class TileUtils { 
    private static boolean updateTileData(Context context, Tile tile,

            ActivityInfo activityInfo, ApplicationInfo applicationInfo, PackageManager pm) {

        if (applicationInfo.isSystemApp()) {

            CharSequence title = null;

            String summary = null;



            // Get the activity's meta-data
@@ -338,13 +336,6 @@ public class TileUtils { 
                Bundle metaData = activityInfo.metaData;



                if (res != null && metaData != null) {

                    if (metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {

                        if (metaData.get(META_DATA_PREFERENCE_TITLE) instanceof Integer) {

                            title = res.getString(metaData.getInt(META_DATA_PREFERENCE_TITLE));

                        } else {

                            title = metaData.getString(META_DATA_PREFERENCE_TITLE);

                        }

                    }

                    if (metaData.containsKey(META_DATA_PREFERENCE_SUMMARY)) {

                        if (metaData.get(META_DATA_PREFERENCE_SUMMARY) instanceof Integer) {

                            summary = res.getString(metaData.getInt(META_DATA_PREFERENCE_SUMMARY));
@@ -356,16 +347,6 @@ public class TileUtils { 
            } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {

                if (DEBUG) Log.d(LOG_TAG, "Couldn't find info", e);

            }



            // Set the preference title to the activity's label if no

            // meta-data is found

            if (TextUtils.isEmpty(title)) {

                title = activityInfo.loadLabel(pm).toString();

            }



            // Set title and summary for the preference

            tile.title = title;

            tile.summary = summary;

            return true;

        }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java

+2 −47
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMM 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.argThat;
@@ -39,7 +38,6 @@ import static org.robolectric.RuntimeEnvironment.application; 
import android.app.ActivityManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.IContentProvider;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;
@@ -47,9 +45,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.net.Uri;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings.Global;
@@ -80,8 +76,6 @@ public class TileUtilsTest { 
    @Mock

    private UserManager mUserManager;

    @Mock

    private IContentProvider mIContentProvider;

    @Mock

    private ContentResolver mContentResolver;



    private static final String URI_GET_SUMMARY = "content://authority/text/summary";
@@ -214,7 +208,7 @@ public class TileUtilsTest { 
                null /* defaultCategory */, outTiles, false /* usePriority */);



        assertThat(outTiles.size()).isEqualTo(1);

        assertThat(outTiles.get(0).title).isEqualTo("my title");

        assertThat(outTiles.get(0).getTitle(mContext)).isEqualTo("my title");

    }



    @Test
@@ -236,7 +230,7 @@ public class TileUtilsTest { 
        TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,

                null /* defaultCategory */, outTiles, false /* usePriority */);

        assertThat(outTiles.size()).isEqualTo(1);

        assertThat(outTiles.get(0).title).isEqualTo("my localized title");

        assertThat(outTiles.get(0).getTitle(mContext)).isEqualTo("my localized title");



        // Icon should be tintable because the tile is not from settings package, and

        // "forceTintExternalIcon" is set
@@ -285,45 +279,6 @@ public class TileUtilsTest { 
        assertThat(outTiles.get(0).isIconTintable(mContext)).isTrue();

    }



    @Test

    public void getTilesForIntent_shouldNotProcessInvalidUriContentSystemApp()

            throws RemoteException {

        Intent intent = new Intent();

        Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>();

        List<Tile> outTiles = new ArrayList<>();

        List<ResolveInfo> info = new ArrayList<>();

        ResolveInfo resolveInfo = newInfo(true, null /* category */, null, null, URI_GET_SUMMARY);

        info.add(resolveInfo);



        when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt()))

                .thenReturn(info);



        // Case 1: No provider associated with the uri specified.

        TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,

                null /* defaultCategory */, outTiles, false /* usePriority */);



        assertThat(outTiles.size()).isEqualTo(1);

        assertThat(outTiles.get(0).getIcon(mContext).getResId()).isEqualTo(314159);

        assertThat(outTiles.get(0).summary).isEqualTo("static-summary");



        // Case 2: Empty bundle.

        Bundle bundle = new Bundle();

        when(mIContentProvider.call(anyString(),

                eq(TileUtils.getMethodFromUri(Uri.parse(URI_GET_SUMMARY))), eq(URI_GET_SUMMARY),

                any())).thenReturn(bundle);

        when(mContentResolver.acquireUnstableProvider(anyString()))

                .thenReturn(mIContentProvider);

        when(mContentResolver.acquireUnstableProvider(any(Uri.class)))

                .thenReturn(mIContentProvider);



        TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache,

                null /* defaultCategory */, outTiles, false /* usePriority */);



        assertThat(outTiles.size()).isEqualTo(1);

        assertThat(outTiles.get(0).getIcon(mContext).getResId()).isEqualTo(314159);

        assertThat(outTiles.get(0).summary).isEqualTo("static-summary");

    }



    @Test

    public void getTilesForIntent_shouldProcessUriContentForSystemApp() {

        Intent intent = new Intent();