diff options
| author | 2018-08-17 01:44:55 -0700 | |
|---|---|---|
| committer | 2018-08-17 01:44:55 -0700 | |
| commit | d48ec695d3dcacf2c5a60dfc34a3084ac5f1b571 (patch) | |
| tree | 5eb3c06522395cf9e44fdc2d737b35c84f3438b8 | |
| parent | 47ea1e53f3770fb8e0147b27e5513e316d8324f6 (diff) | |
| parent | d68f003c67ca6364202a57f0c695012d4ea4571e (diff) | |
Merge "Code reformatting for upcoming automated code changes."
am: d68f003c67
Change-Id: I4c95500cddf7659b13ada0ad70584aef190ced7f
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 5 | ||||
| -rw-r--r-- | core/java/android/widget/TextView.java | 10 | ||||
| -rw-r--r-- | core/java/android/widget/Toast.java | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index bbdf15c871bb..d1de498d71ed 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -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 diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a57d154532eb..a8d9ab403cd0 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -420,7 +420,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; @@ -716,8 +718,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; diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java index d74a60e483e5..8c8cbd6ce393 100644 --- a/core/java/android/widget/Toast.java +++ b/core/java/android/widget/Toast.java @@ -354,7 +354,8 @@ public class Toast { final Handler mHandler; int mGravity; - int mX, mY; + int mX; + int mY; float mHorizontalMargin; float mVerticalMargin; |