From 6e6d78116b584272aeda6924d1802ba18d4b8758 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Mon, 1 Oct 2012 15:32:01 -0700
Subject: [PATCH] Fix bug #7259242 text is left justified with no padding

(padding is still hard)

- fix Toasts: basically the background drawable padding was not
taken into account

Change-Id: Iefd29782f50b6f6a56578cfeb2af119d381207f0
---
 core/java/android/view/View.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ef752893696a2..4838fb78ee31d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3654,11 +3654,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             if (!leftPaddingDefined && startPaddingDefined) {
                 leftPadding = startPadding;
             }
-            mUserPaddingLeftInitial = (leftPadding > 0) ? leftPadding : 0;
+            mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial;
             if (!rightPaddingDefined && endPaddingDefined) {
                 rightPadding = endPadding;
             }
-            mUserPaddingRightInitial = (rightPadding > 0) ? rightPadding : 0;
+            mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial;
         } else {
             // Jelly Bean MR1 and after case: if start/end defined, they will override any left/right
             // values defined. Otherwise, left /right values are used.