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

Commit e10abafa authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert Cls stopping now-master running on googlefood"" into ub-now-master

parents 5ba21b60 c2bd8101

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay 
LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/



LOCAL_SDK_VERSION := 19

# STOPSHIP(kennyguy): change to 21 once the L SDK is baked.

LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := Launcher3

#LOCAL_CERTIFICATE := shared

src/com/android/launcher3/AppInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class AppInfo extends ItemInfo { 
    }



    private static int initFlags(LauncherActivityInfoCompat info) {

        int appFlags = info.getApplicationFlags();

        int appFlags = info.getApplicationInfo().flags;

        int flags = 0;

        if ((appFlags & android.content.pm.ApplicationInfo.FLAG_SYSTEM) == 0) {

            flags |= DOWNLOADED_FLAG;

src/com/android/launcher3/BubbleTextView.java

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ public class BubbleTextView extends TextView { 
        Drawable iconDrawable = Utilities.createIconDrawable(b);

        setCompoundDrawables(null, iconDrawable, null, null);

        setCompoundDrawablePadding(grid.iconDrawablePaddingPx);

        if (info.contentDescription != null) {

            setContentDescription(info.contentDescription);

        }

        setTag(info);

        if (info.isPromise()) {

            applyState();

src/com/android/launcher3/Folder.java

+3 −0
Original line number Diff line number Diff line
@@ -571,6 +571,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList 
        textView.setCompoundDrawables(null,

                Utilities.createIconDrawable(item.getIcon(mIconCache)), null, null);

        textView.setText(item.title);

        if (item.contentDescription != null) {

            textView.setContentDescription(item.contentDescription);

        }

        textView.setTag(item);

        textView.setTextColor(getResources().getColor(R.color.folder_items_text_color));

        textView.setShadowsEnabled(false);

src/com/android/launcher3/IconCache.java

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class IconCache { 
    private static class CacheEntry {

        public Bitmap icon;

        public String title;

        public String contentDescription;

    }



    private static class CacheKey {
@@ -240,6 +241,7 @@ public class IconCache { 


            application.title = entry.title;

            application.iconBitmap = entry.icon;

            application.contentDescription = entry.contentDescription;

        }

    }
@@ -262,6 +264,7 @@ public class IconCache { 
            CacheEntry entry = cacheLocked(component, launcherActInfo, null, user);

            if (title != null) {

                entry.title = title;

                entry.contentDescription = mUserManager.getBadgedLabelForUser(title, user);

            }

            return entry.icon;

        }
@@ -310,6 +313,7 @@ public class IconCache { 
                    }

                }



                entry.contentDescription = mUserManager.getBadgedLabelForUser(entry.title, user);

                entry.icon = Utilities.createIconBitmap(

                        info.getBadgedIcon(mIconDpi), mContext);

            } else {