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

Commit 7c548a57 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where the order of the icons was wrong" into oc-mr1-dev

am: 942aaf5a

Change-Id: I199657bc2e2582cd2228045ae208d96bbc951485
parents cb75ec65 942aaf5a
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -796,6 +796,24 @@ public class StatusBarIconView extends AnimatedImageView {
        }
    }

    /**
     * This method returns the drawing rect for the view which is different from the regular
     * drawing rect, since we layout all children at position 0 and usually the translation is
     * neglected. The standard implementation doesn't account for translation.
     *
     * @param outRect The (scrolled) drawing bounds of the view.
     */
    @Override
    public void getDrawingRect(Rect outRect) {
        super.getDrawingRect(outRect);
        float translationX = getTranslationX();
        float translationY = getTranslationY();
        outRect.left += translationX;
        outRect.right += translationX;
        outRect.top += translationY;
        outRect.bottom += translationY;
    }

    public void setIsInShelf(boolean isInShelf) {
        mIsInShelf = isInShelf;
    }