Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Code reformatting for upcoming automated code changes." am: d68f003c67 am: d48ec695d3

Browse Source 
am: 640fa1526d

Change-Id: Idc4ce525b14a29f6ed87850f6df9577bdd05f38e
This commit is contained in:
Mathew Inwood
2018-08-17 02:08:49 -07:00
committed by android-build-merger
parent 6e5dc47e03 640fa1526d
commit 2fb271cb29
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/widget/RelativeLayout.java
View File

@@ -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

10
core/java/android/widget/TextView.java
View File

@@ -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;

3
core/java/android/widget/Toast.java
View File

@@ -355,7 +355,8 @@ public class Toast {
final Handler mHandler;
int mGravity;
int mX, mY;
int mX;
int mY;
float mHorizontalMargin;
float mVerticalMargin;