commit 4d227268c604f8fd7172b7faf9e63ec57576ab9c
author Maurice Lam <yukl@google.com> Fri Apr 29 15:07:40 2016 -0700
committer Maurice Lam <yukl@google.com> Fri Apr 29 15:07:40 2016 -0700
tree d51122ff04d7977b3dbd50d539bba50d58e027cb
parent aee8d8c7e127cf35c0d579c3cbfc6204d6b3229f

Remove top padding only if illustration is present

Bug: 28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2

src/com/android/settings/deviceinfo/StorageWizardBase.java

diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index f070f70..c7bea30 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -35,6 +35,7 @@
 
 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 @@
         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