Merge "[WifiSetup] Update illustrations" into lmp-dev

This commit is contained in:
Maurice Lam
2014-08-15 02:46:37 +00:00
committed by Android (Google) Code Review
12 changed files with 21 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -16,5 +16,5 @@
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/grass_tile"
android:src="@drawable/setup_illustration_tile"
android:tileMode="repeat" />

View File

@@ -25,7 +25,7 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/grass">
android:background="@drawable/setup_illustration_bg">
<TextView
android:id="@+id/title"

View File

@@ -16,6 +16,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,8 +26,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:foreground="@drawable/illustration_wifi_wide"
android:background="@drawable/grass">
android:foreground="@drawable/setup_illustration_wifi_wide"
android:background="@drawable/setup_illustration_bg"
settings:autoMirrored="true">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -21,10 +21,11 @@
android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/grass"
android:foreground="@drawable/illustration_wifi"
android:background="@drawable/setup_illustration_bg"
android:foreground="@drawable/setup_illustration_wifi"
android:tag="stickyContainer"
settings:aspectRatio="2.0">
settings:aspectRatio="2.0"
settings:autoMirrored="true">
<TextView
android:id="@+id/title"

View File

@@ -24,6 +24,7 @@
<declare-styleable name="SetupWizardIllustration">
<attr name="aspectRatio" format="float" />
<attr name="autoMirrored" format="boolean" />
</declare-styleable>
<declare-styleable name="BatteryHistoryChart">