From 4cbbaedb2ca5cbd066b620fea7b52f8ef517caf1 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 22 Aug 2018 14:23:35 -0700
Subject: [PATCH] Preventing padding from getting reset when the widget updates

Bug: 112854572
Change-Id: Ia2963310997ca13f2e1f18f7268b0b9b54a53590
---
 src/com/android/launcher3/qsb/QsbContainerView.java  | 1 -
 src/com/android/launcher3/qsb/QsbWidgetHostView.java | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/qsb/QsbContainerView.java b/src/com/android/launcher3/qsb/QsbContainerView.java
index 8e29df16ab..5b8ae58369 100644
--- a/src/com/android/launcher3/qsb/QsbContainerView.java
+++ b/src/com/android/launcher3/qsb/QsbContainerView.java
@@ -162,7 +162,6 @@ public class QsbContainerView extends FrameLayout {
                         .getAppWidgetOptions(widgetId), opts)) {
                     mQsb.updateAppWidgetOptions(opts);
                 }
-                mQsb.setPadding(0, 0, 0, 0);
                 mQsbWidgetHost.startListening();
                 return mQsb;
             }
diff --git a/src/com/android/launcher3/qsb/QsbWidgetHostView.java b/src/com/android/launcher3/qsb/QsbWidgetHostView.java
index 407812dd1a..cff5126375 100644
--- a/src/com/android/launcher3/qsb/QsbWidgetHostView.java
+++ b/src/com/android/launcher3/qsb/QsbWidgetHostView.java
@@ -52,6 +52,11 @@ public class QsbWidgetHostView extends AppWidgetHostView {
         return mPreviousOrientation != orientation;
     }
 
+    @Override
+    public void setPadding(int left, int top, int right, int bottom) {
+        // Prevent the base class from applying the default widget padding.
+        super.setPadding(0, 0, 0, 0);
+    }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {