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

Merge "[WifiSetup] Add shadow below header" into lmp-dev

Browse Source
This commit is contained in:
Maurice Lam
2014-09-02 18:51:36 +00:00
committed by Android (Google) Code Review
parent bde55601ba d531a08702
commit def48d605a
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout-land/setup_preference.xml
View File

@@ -25,7 +25,8 @@
android:id="@+id/title_area" android:id="@+id/title_area"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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 <TextView
android:id="@+id/title" android:id="@+id/title"

1
res/layout/setup_wizard_header.xml
View File

@@ -22,6 +22,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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"
android:foreground="@drawable/setup_illustration_wifi" android:foreground="@drawable/setup_illustration_wifi"
android:tag="stickyContainer" android:tag="stickyContainer"
settings:aspectRatio="2.22"> settings:aspectRatio="2.22">

1
res/values/dimens.xml
View File

@@ -58,6 +58,7 @@
<dimen name="setup_wizard_card_port_margin_sides">56dp</dimen> <dimen name="setup_wizard_card_port_margin_sides">56dp</dimen>
<dimen name="setup_wizard_card_land_margin_top">128dp</dimen> <dimen name="setup_wizard_card_land_margin_top">128dp</dimen>
<dimen name="setup_wizard_margin_sides">40dp</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_height">3dip</dimen>
<dimen name="divider_margin_top">6dip</dimen> <dimen name="divider_margin_top">6dip</dimen>

3
src/com/android/settings/widget/SetupWizardIllustration.java
View File

@@ -23,8 +23,8 @@ import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.ViewOutlineProvider;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.android.settings.R; import com.android.settings.R;
@@ -107,6 +107,7 @@ public class SetupWizardIllustration extends FrameLayout {
illustrationHeight -= illustrationHeight % mBaselineGridSize; illustrationHeight -= illustrationHeight % mBaselineGridSize;
setPaddingRelative(0, illustrationHeight, 0, 0); setPaddingRelative(0, illustrationHeight, 0, 0);
} }
setOutlineProvider(ViewOutlineProvider.BOUNDS);
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }