From 4d227268c604f8fd7172b7faf9e63ec57576ab9c Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Fri, 29 Apr 2016 15:07:40 -0700 Subject: [PATCH] Remove top padding only if illustration is present Bug: 28469515 Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2 --- .../settings/deviceinfo/StorageWizardBase.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index f070f70db7e..c7bea30fe1f 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -35,6 +35,7 @@ import android.widget.TextView; import com.android.settings.R; import com.android.setupwizardlib.SetupWizardLayout; +import com.android.setupwizardlib.view.Illustration; import java.text.NumberFormat; import java.util.List; @@ -119,10 +120,12 @@ public abstract class StorageWizardBase extends Activity { scrollView.setVerticalFadingEdgeEnabled(true); scrollView.setFadingEdgeLength(scrollView.getVerticalFadingEdgeLength() * 2); - // Our header assets already have padding baked in - final View title = findViewById(R.id.suw_layout_title); - title.setPadding(title.getPaddingLeft(), 0, title.getPaddingRight(), - title.getPaddingBottom()); + if (findViewById(R.id.suw_layout_decor) instanceof Illustration) { + // Our header illustration already have padding baked in + final View title = findViewById(R.id.suw_layout_title); + title.setPadding(title.getPaddingLeft(), 0, title.getPaddingRight(), + title.getPaddingBottom()); + } } @Override