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

Commit b9654275 authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Android (Google) Code Review
Browse files

Revert "Fix the badge in badge (triple badging), by simply remov..." 

Revert submission 24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Reason for revert: Breaking tests

Reverted changes: /q/submissionid:24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Change-Id: Ia78cbae76d52b52fdfdc258311712f44bd645f2e
parent f2b2202b

src/com/android/launcher3/BubbleTextView.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.Flags.enableCursorHoverStates; 
import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING;

import static com.android.launcher3.config.FeatureFlags.ENABLE_ICON_LABEL_AUTO_SCALING;

import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;

import static com.android.launcher3.graphics.PreloadIconDrawable.newPendingIcon;

import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE;

import static com.android.launcher3.icons.BitmapInfo.FLAG_NO_BADGE;

import static com.android.launcher3.icons.BitmapInfo.FLAG_SKIP_USER_BADGE;

import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;

import static com.android.launcher3.icons.BitmapInfo.FLAG_THEMED;

import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;

import static com.android.launcher3.icons.GraphicsUtils.setColorAlphaBound;

import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;

import static com.android.launcher3.model.data.ItemInfoWithIcon.FLAG_INCREMENTAL_DOWNLOAD_ACTIVE;
@@ -165,8 +164,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
    @ViewDebug.ExportedProperty(category = "launcher")

    @ViewDebug.ExportedProperty(category = "launcher")

    private boolean mHideBadge = false;

    private boolean mHideBadge = false;

    @ViewDebug.ExportedProperty(category = "launcher")

    @ViewDebug.ExportedProperty(category = "launcher")

    private boolean mSkipUserBadge = false;

    @ViewDebug.ExportedProperty(category = "launcher")

    private boolean mIsIconVisible = true;

    private boolean mIsIconVisible = true;

    @ViewDebug.ExportedProperty(category = "launcher")

    @ViewDebug.ExportedProperty(category = "launcher")

    private int mTextColor;

    private int mTextColor;
@@ -269,10 +266,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        mHideBadge = hideBadge;

        mHideBadge = hideBadge;

    }

    }





    public void setSkipUserBadge(boolean skipUserBadge) {

        mSkipUserBadge = skipUserBadge;

    }



    /**

    /**

     * Resets the view so it can be recycled.

     * Resets the view so it can be recycled.

     */

     */
@@ -402,9 +395,6 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        if (mHideBadge || mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {

        if (mHideBadge || mDisplay == DISPLAY_SEARCH_RESULT_SMALL) {

            flags |= FLAG_NO_BADGE;

            flags |= FLAG_NO_BADGE;

        }

        }

        if (mSkipUserBadge) {

            flags |= FLAG_SKIP_USER_BADGE;

        }

        FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);

        FastBitmapDrawable iconDrawable = info.newIcon(getContext(), flags);

        mDotParams.appColor = iconDrawable.getIconColor();

        mDotParams.appColor = iconDrawable.getIconColor();

        mDotParams.dotColor = Themes.getAttrColor(getContext(), R.attr.notificationDotColor);

        mDotParams.dotColor = Themes.getAttrColor(getContext(), R.attr.notificationDotColor);