diff options
| author | Maurice Lam <yukl@google.com> | 2014-12-03 16:12:31 -0800 |
|---|---|---|
| committer | Maurice Lam <yukl@google.com> | 2014-12-03 21:19:21 -0800 |
| commit | 1227a19ecc0e5a42156027ae58bea7f77bf41a27 (patch) | |
| tree | a2c192cb6840ca29e43cca664c1fc99d566a8228 /res/layout | |
| parent | a3dff74e59b29fdff63810e55c27207a8354c935 (diff) | |
| download | packages_apps_Settings-1227a19ecc0e5a42156027ae58bea7f77bf41a27.zip packages_apps_Settings-1227a19ecc0e5a42156027ae58bea7f77bf41a27.tar.gz packages_apps_Settings-1227a19ecc0e5a42156027ae58bea7f77bf41a27.tar.bz2 | |
[FRP] Add illustration to lock screen setup
Added the illustration JPG files, and added
SetupWizardUtils.setIllustration method that will change the
illustrations in the layout.
Bug: 18482708
Change-Id: I8c6758113f07cd33f85eaf6bc019e8194d9a17ce
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/setup_template.xml | 6 | ||||
| -rw-r--r-- | res/layout/setup_wizard_header.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/res/layout/setup_template.xml b/res/layout/setup_template.xml index 7d8ffc8..0623e25 100644 --- a/res/layout/setup_template.xml +++ b/res/layout/setup_template.xml @@ -35,12 +35,12 @@ android:clipChildren="false"> <com.android.settings.widget.SetupWizardIllustration - android:id="@+id/illustration_phone" + android:id="@+id/setup_illustration" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="@dimen/setup_wizard_title_area_elevation" android:background="@drawable/setup_illustration_bg" - android:foreground="@drawable/setup_illustration_wifi" + android:foreground="@drawable/setup_illustration" android:tag="stickyContainer" settings:aspectRatio="2.22"> @@ -58,7 +58,7 @@ android:id="@+id/setup_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/illustration_phone" + android:layout_below="@id/setup_illustration" android:clipChildren="false"/> </RelativeLayout> diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml index c38a68d..b030ad1 100644 --- a/res/layout/setup_wizard_header.xml +++ b/res/layout/setup_wizard_header.xml @@ -18,12 +18,12 @@ <com.android.settings.widget.SetupWizardIllustration xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" - android:id="@+id/title_area" + android:id="@+id/setup_illustration" 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:foreground="@drawable/setup_illustration" android:tag="stickyContainer" settings:aspectRatio="2.22"> |