[WifiSetup] Add shadow below header
Added shadow for phone portrait and landscape layouts
Bug: 17136887
Change-Id: I65dc01d7387812681bbc99d5cc9440714a72ff60
diff --git a/res/layout-land/setup_preference.xml b/res/layout-land/setup_preference.xml
index ce655d6..b525b68 100644
--- a/res/layout-land/setup_preference.xml
+++ b/res/layout-land/setup_preference.xml
@@ -25,7 +25,8 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/setup_illustration_bg">
+ android:background="@drawable/setup_illustration_bg"
+ android:elevation="@dimen/setup_wizard_title_area_elevation">
<TextView
android:id="@+id/title"
diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml
index 8334868..c38a68d 100644
--- a/res/layout/setup_wizard_header.xml
+++ b/res/layout/setup_wizard_header.xml
@@ -22,6 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/setup_illustration_bg"
+ android:elevation="@dimen/setup_wizard_title_area_elevation"
android:foreground="@drawable/setup_illustration_wifi"
android:tag="stickyContainer"
settings:aspectRatio="2.22">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fcfd5bc..e9a5798 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,6 +58,7 @@
<dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>
<dimen name="setup_wizard_card_land_margin_top">128dp</dimen>
<dimen name="setup_wizard_margin_sides">40dp</dimen>
+ <dimen name="setup_wizard_title_area_elevation">3dp</dimen>
<dimen name="divider_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen>
diff --git a/src/com/android/settings/widget/SetupWizardIllustration.java b/src/com/android/settings/widget/SetupWizardIllustration.java
index acdb5b3..717ec35 100644
--- a/src/com/android/settings/widget/SetupWizardIllustration.java
+++ b/src/com/android/settings/widget/SetupWizardIllustration.java
@@ -23,8 +23,8 @@
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
-import android.util.Log;
import android.view.Gravity;
+import android.view.ViewOutlineProvider;
import android.widget.FrameLayout;
import com.android.settings.R;
@@ -107,6 +107,7 @@
illustrationHeight -= illustrationHeight % mBaselineGridSize;
setPaddingRelative(0, illustrationHeight, 0, 0);
}
+ setOutlineProvider(ViewOutlineProvider.BOUNDS);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}