diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-09-27 19:55:18 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-09-27 19:55:18 -0700 |
| commit | 75aefb8fe8d3b1fd6664f73273ad18d0236d4e82 (patch) | |
| tree | ab1c9f03d1665d829137931d02759c83801212e8 /core/java/android | |
| parent | bbd1029b702ea56804101ece9acd455282174293 (diff) | |
Fix bug #7249363 Icons in the Camera UI (to switch camera types and on the focus ring) are missing
- no need to initialize mPaddingLeft/Right to UNDEFINED_PADDING
Change-Id: Icfdcc9bcb904228443e9adfde8038b5d8764365b
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/View.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 750badd52ff6..111f95903ba3 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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) { |