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

Commit 7bc272a1 authored by Kenny Guy's avatar Kenny Guy
Browse files

Revert Cls stopping now-master running on googlefood 

This reverts commits 01453e85.
and 242bbe1b.
"Add content description to bagded icons."
"Remove reflection now we are building against L"

Bug: 15833449
Change-Id: I81a5316f5619a9cd3b6ab9fd03b2ba96657b7f68
parent 01453e85

Android.mk

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

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



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

LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := 19



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.getApplicationInfo().flags;

        int appFlags = info.getApplicationFlags();

        int flags = 0;

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

            flags |= DOWNLOADED_FLAG;

src/com/android/launcher3/BubbleTextView.java

+0 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ public class BubbleTextView extends TextView { 
        setCompoundDrawables(null, iconDrawable, null, null);

        setCompoundDrawablePadding(grid.iconDrawablePaddingPx);

        setText(info.title);

        if (info.contentDescription != null) {

            setContentDescription(info.contentDescription);

        }

        setTag(info);

        if (info.isPromise()) {

            setState(ShortcutInfo.PACKAGE_STATE_UNKNOWN); // TODO: persist this state somewhere

src/com/android/launcher3/Folder.java

+0 −3
Original line number Diff line number Diff line
@@ -571,9 +571,6 @@ 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

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

        public Bitmap icon;

        public String title;

        public String contentDescription;

    }



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


            application.title = entry.title;

            application.iconBitmap = entry.icon;

            application.contentDescription = entry.contentDescription;

        }

    }
@@ -264,7 +262,6 @@ 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;

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

                }



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

                entry.icon = Utilities.createIconBitmap(

                        info.getBadgedIcon(mIconDpi), mContext);

            } else {