commit 0e4816efb99e28a25efecee1702c552bfb9ba849
author Maurice Lam <yukl@google.com> Mon May 02 17:58:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 17:58:10 2016 +0000
tree 4dbc36f8719be6bc49b88e86efd4ccc4ed24f21f
parent 820d7c85c724b28267b1a5d0dee8b190f49d8517
parent 4d227268c604f8fd7172b7faf9e63ec57576ab9c

Merge "Remove top padding only if illustration is present" into nyc-dev

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