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

Commit 10a2979e authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on... 

Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev
parents 7befb7de 75aefb8f

core/java/android/view/View.java

+4 −4
Original line number Diff line number Diff line
@@ -2787,14 +2787,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * {@hide}

     */

    @ViewDebug.ExportedProperty(category = "padding")

    protected int mPaddingLeft = UNDEFINED_PADDING;

    protected int mPaddingLeft = 0;

    /**

     * The right padding in pixels, that is the distance in pixels between the

     * right edge of this view and the right edge of its content.

     * {@hide}

     */

    @ViewDebug.ExportedProperty(category = "padding")

    protected int mPaddingRight = UNDEFINED_PADDING;

    protected int mPaddingRight = 0;

    /**

     * The top padding in pixels, that is the distance in pixels between the

     * top edge of this view and the top edge of its content.
@@ -3664,9 +3664,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        mUserPaddingLeftInitial = leftPadding >= 0 ? leftPadding : mPaddingLeft;

        mUserPaddingRightInitial = rightPadding >= 0 ? rightPadding : mPaddingRight;

        internalSetPadding(

                mUserPaddingLeftInitial != UNDEFINED_PADDING ? mUserPaddingLeftInitial : 0,

                mUserPaddingLeftInitial,

                topPadding >= 0 ? topPadding : mPaddingTop,

                mUserPaddingRightInitial != UNDEFINED_PADDING ? mUserPaddingRightInitial : 0,

                mUserPaddingRightInitial,

                bottomPadding >= 0 ? bottomPadding : mPaddingBottom);















        if (viewFlagMasks != 0) {