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

Commit 0993a378 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Adding a utility class to enforce that icons are always flattened on... 

Merge "Adding a utility class to enforce that icons are always flattened on the background thread." into ub-launcher3-master
parents aa8a871e 32f3dda8

src/com/android/launcher3/AutoInstallsLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.launcher3;



import android.appwidget.AppWidgetHost;

import android.appwidget.AppWidgetManager;

import android.content.ComponentName;

import android.content.ContentValues;

import android.content.Context;
@@ -437,7 +436,8 @@ public class AutoInstallsLayout { 
                return -1;

            }



            ItemInfo.writeBitmap(mValues, LauncherIcons.createIconBitmap(icon, mContext));

            mValues.put(LauncherSettings.Favorites.ICON,

                    Utilities.flattenBitmap(LauncherIcons.createIconBitmap(icon, mContext)));

            mValues.put(Favorites.ICON_PACKAGE, mIconRes.getResourcePackageName(iconId));

            mValues.put(Favorites.ICON_RESOURCE, mIconRes.getResourceName(iconId));

src/com/android/launcher3/FolderInfo.java

+5 −5
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package com.android.launcher3;



import android.content.ContentValues;

import android.content.Context;



import com.android.launcher3.compat.UserHandleCompat;

import com.android.launcher3.util.ContentWriter;



import java.util.ArrayList;
@@ -93,10 +93,10 @@ public class FolderInfo extends ItemInfo { 
    }



    @Override

    void onAddToDatabase(Context context, ContentValues values) {

        super.onAddToDatabase(context, values);

        values.put(LauncherSettings.Favorites.TITLE, title.toString());

        values.put(LauncherSettings.Favorites.OPTIONS, options);

    void onAddToDatabase(ContentWriter writer) {

        super.onAddToDatabase(writer);

        writer.put(LauncherSettings.Favorites.TITLE, title)

                .put(LauncherSettings.Favorites.OPTIONS, options);



    }

src/com/android/launcher3/IconCache.java

+0 −2
Original line number Diff line number Diff line
@@ -494,7 +494,6 @@ public class IconCache { 
            shortcutInfo.setIcon(getDefaultIcon(user));

            shortcutInfo.title = "";

            shortcutInfo.contentDescription = "";

            shortcutInfo.usingFallbackIcon = true;

            shortcutInfo.usingLowResIcon = false;

        } else {

            LauncherActivityInfoCompat info = mLauncherApps.resolveActivity(intent, user);
@@ -512,7 +511,6 @@ public class IconCache { 
        shortcutInfo.setIcon(getNonNullIcon(entry, user));

        shortcutInfo.title = Utilities.trim(entry.title);

        shortcutInfo.contentDescription = entry.contentDescription;

        shortcutInfo.usingFallbackIcon = isDefaultIcon(entry.icon, user);

        shortcutInfo.usingLowResIcon = entry.isLowResIcon;

    }

src/com/android/launcher3/ItemInfo.java

+13 −26
Original line number Diff line number Diff line
@@ -18,12 +18,10 @@ package com.android.launcher3; 


import android.content.ComponentName;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;



import com.android.launcher3.compat.UserHandleCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.ContentWriter;



/**

 * Represents an item in the launcher.
@@ -142,15 +140,15 @@ public class ItemInfo { 
        return getIntent() == null ? null : getIntent().getComponent();

    }



    public void writeToValues(ContentValues values) {

        values.put(LauncherSettings.Favorites.ITEM_TYPE, itemType);

        values.put(LauncherSettings.Favorites.CONTAINER, container);

        values.put(LauncherSettings.Favorites.SCREEN, screenId);

        values.put(LauncherSettings.Favorites.CELLX, cellX);

        values.put(LauncherSettings.Favorites.CELLY, cellY);

        values.put(LauncherSettings.Favorites.SPANX, spanX);

        values.put(LauncherSettings.Favorites.SPANY, spanY);

        values.put(LauncherSettings.Favorites.RANK, rank);

    public void writeToValues(ContentWriter writer) {

        writer.put(LauncherSettings.Favorites.ITEM_TYPE, itemType)

                .put(LauncherSettings.Favorites.CONTAINER, container)

                .put(LauncherSettings.Favorites.SCREEN, screenId)

                .put(LauncherSettings.Favorites.CELLX, cellX)

                .put(LauncherSettings.Favorites.CELLY, cellY)

                .put(LauncherSettings.Favorites.SPANX, spanX)

                .put(LauncherSettings.Favorites.SPANY, spanY)

                .put(LauncherSettings.Favorites.RANK, rank);

    }



    public void readFromValues(ContentValues values) {
@@ -166,26 +164,15 @@ public class ItemInfo { 


    /**

     * Write the fields of this item to the DB

     *

     * @param context A context object to use for getting UserManagerCompat

     * @param values

     */

    void onAddToDatabase(Context context, ContentValues values) {

        writeToValues(values);

        long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user);

        values.put(LauncherSettings.Favorites.PROFILE_ID, serialNumber);



    void onAddToDatabase(ContentWriter writer) {

        if (screenId == Workspace.EXTRA_EMPTY_SCREEN_ID) {

            // We should never persist an item on the extra empty screen.

            throw new RuntimeException("Screen id should not be EXTRA_EMPTY_SCREEN_ID");

        }

    }



    static void writeBitmap(ContentValues values, Bitmap bitmap) {

        if (bitmap != null) {

            byte[] data = Utilities.flattenBitmap(bitmap);

            values.put(LauncherSettings.Favorites.ICON, data);

        }

        writeToValues(writer);

        writer.put(LauncherSettings.Favorites.PROFILE_ID, user);

    }



    @Override

src/com/android/launcher3/LauncherAppWidgetInfo.java

+7 −9
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ package com.android.launcher3; 


import android.appwidget.AppWidgetHostView;

import android.content.ComponentName;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;



import com.android.launcher3.compat.UserHandleCompat;

import com.android.launcher3.util.ContentWriter;



/**

 * Represents a widget (either instantiated or about to be) in the Launcher.
@@ -127,13 +126,12 @@ public class LauncherAppWidgetInfo extends ItemInfo { 
    }



    @Override

    void onAddToDatabase(Context context, ContentValues values) {

        super.onAddToDatabase(context, values);

        values.put(LauncherSettings.Favorites.APPWIDGET_ID, appWidgetId);

        values.put(LauncherSettings.Favorites.APPWIDGET_PROVIDER, providerName.flattenToString());

        values.put(LauncherSettings.Favorites.RESTORED, restoreStatus);

        values.put(LauncherSettings.Favorites.INTENT,

                bindOptions == null ? null : bindOptions.toUri(0));

    void onAddToDatabase(ContentWriter writer) {

        super.onAddToDatabase(writer);

        writer.put(LauncherSettings.Favorites.APPWIDGET_ID, appWidgetId)

                .put(LauncherSettings.Favorites.APPWIDGET_PROVIDER, providerName.flattenToString())

                .put(LauncherSettings.Favorites.RESTORED, restoreStatus)

                .put(LauncherSettings.Favorites.INTENT, bindOptions);

    }



    /**