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

am ac7348a3: am 10a2979e: Merge "Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing" into jb-mr1-dev

Browse Source 
* commit 'ac7348a3228177a0e08b8be2fec88e23b82c6043':
  Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing
This commit is contained in:
Fabrice Di Meglio
2012-09-28 00:37:11 -07:00
committed by Android Git Automerger
parent 55a014a35e ac7348a322
commit 3fd13cb4be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/View.java
View File

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