PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove top padding only if illustration is present" into nyc-dev am: 0e4816efb9 am: 0f27a312b7

Browse Source 
am: 114ce05d7f

* commit '114ce05d7f2c487dccf0098440375e2865756c68':
  Remove top padding only if illustration is present

Change-Id: Ie16353f5d99034be57a070b07f8023c6382555cb
This commit is contained in:
Maurice Lam
2016-05-02 18:14:57 +00:00
committed by android-build-merger
parent c217ec8ef7 114ce05d7f
commit 2d33647a8a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/deviceinfo/StorageWizardBase.java
View File

@@ -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