From b73a15f71e63dd46bf4dab94ca13caa861ac948f Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Mon, 9 Mar 2015 14:19:02 -0700 Subject: [PATCH] [SetupWizardLib] Rename setBackground Rename SetupWizardLayout.setBackground to setLayoutBackground, to avoid overriding the default View.setBackground. Change-Id: Ifb273108ce2d7c8a0a93a7b38768dcaad061f297 --- .../src/com/android/setupwizardlib/SetupWizardLayout.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/src/com/android/setupwizardlib/SetupWizardLayout.java b/library/src/com/android/setupwizardlib/SetupWizardLayout.java index f575cc8..e1991a2 100644 --- a/library/src/com/android/setupwizardlib/SetupWizardLayout.java +++ b/library/src/com/android/setupwizardlib/SetupWizardLayout.java @@ -77,7 +77,7 @@ public class SetupWizardLayout extends FrameLayout { final Drawable background = a.getDrawable(R.styleable.SuwSetupWizardLayout_suwBackground); if (background != null) { - setBackground(background); + setLayoutBackground(background); } else { final Drawable backgroundTile = a.getDrawable(R.styleable.SuwSetupWizardLayout_suwBackgroundTile); @@ -221,7 +221,7 @@ public class SetupWizardLayout extends FrameLayout { * Set the background of the layout, which is expected to be able to extend infinitely. If it is * a bitmap tile and you want it to repeat, use {@link #setBackgroundTile(int)} instead. */ - public void setBackground(Drawable background) { + public void setLayoutBackground(Drawable background) { final View view = findViewById(R.id.suw_layout_decor); if (view != null) { view.setBackground(background); @@ -230,7 +230,7 @@ public class SetupWizardLayout extends FrameLayout { /** * Set the background of the layout to a repeating bitmap tile. To use a different kind of - * drawable, use {@link #setBackground(android.graphics.drawable.Drawable)} instead. + * drawable, use {@link #setLayoutBackground(android.graphics.drawable.Drawable)} instead. */ public void setBackgroundTile(int backgroundTile) { final Drawable backgroundTileDrawable = getContext().getDrawable(backgroundTile); @@ -241,7 +241,7 @@ public class SetupWizardLayout extends FrameLayout { if (backgroundTile instanceof BitmapDrawable) { ((BitmapDrawable) backgroundTile).setTileModeXY(TileMode.REPEAT, TileMode.REPEAT); } - setBackground(backgroundTile); + setLayoutBackground(backgroundTile); } private Drawable getIllustration(int asset, int horizontalTile) {