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

Commit 2fb271cb authored by Mathew Inwood's avatar Mathew Inwood Committed by android-build-merger
Browse files

Merge "Code reformatting for upcoming automated code changes." am: d68f003c am: d48ec695

am: 640fa152

Change-Id: Idc4ce525b14a29f6ed87850f6df9577bdd05f38e
parents 6e5dc47e 640fa152
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,10 @@ public class RelativeLayout extends ViewGroup {
        private int[] mRules = new int[VERB_COUNT];
        private int[] mInitialRules = new int[VERB_COUNT];

        private int mLeft, mTop, mRight, mBottom;
        private int mLeft;
        private int mTop;
        private int mRight;
        private int mBottom;

        /**
         * Whether this view had any relative rules modified following the most
+7 −3
Original line number Diff line number Diff line
@@ -421,7 +421,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
    private Editable.Factory mEditableFactory = Editable.Factory.getInstance();
    private Spannable.Factory mSpannableFactory = Spannable.Factory.getInstance();

    private float mShadowRadius, mShadowDx, mShadowDy;
    private float mShadowRadius;
    private float mShadowDx;
    private float mShadowDy;
    private int mShadowColor;

    private boolean mPreDrawRegistered;
@@ -717,8 +719,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
    private Scroller mScroller;
    private TextPaint mTempTextPaint;

    private BoringLayout.Metrics mBoring, mHintBoring;
    private BoringLayout mSavedLayout, mSavedHintLayout;
    private BoringLayout.Metrics mBoring;
    private BoringLayout.Metrics mHintBoring;
    private BoringLayout mSavedLayout;
    private BoringLayout mSavedHintLayout;

    private TextDirectionHeuristic mTextDir;

+2 −1
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ public class Toast {
        final Handler mHandler;

        int mGravity;
        int mX, mY;
        int mX;
        int mY;
        float mHorizontalMargin;
        float mVerticalMargin;