am 7e392fd5: Merge "[WifiSetup] Update illustration" into lmp-dev

* commit '7e392fd59a9fcc89121148cb69c12a787683959c':
  [WifiSetup] Update illustration

res/drawable/setup_illustration_wifi_wide.xml

@@ -15,6 +15,19 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:src="@drawable/setup_illustration_wifi_wide_image" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true">
+
+    <item>
+        <bitmap android:src="@drawable/setup_illustration_horizontal_tile"
+            android:gravity="top"
+            android:tileModeX="repeat"
+            android:tileModeY="disabled" />
+    </item>
+
+    <item android:id="@+id/illustration_image">
+        <bitmap android:src="@drawable/setup_illustration_wifi_wide_image"
+            android:gravity="top|start" />
+    </item>
+
+</layer-list>

res/layout-land/setup_preference.xml

@@ -33,13 +33,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/wifi_setup_wizard_title" />
+
     </FrameLayout>
 
     <TextView
         android:id="@+id/wifi_required_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
+        android:layout_marginBottom="6dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/wifi_required_info_text"
         android:visibility="gone" />

res/layout-sw600dp-land/setup_preference.xml

@@ -39,6 +39,7 @@
                 style="@style/SetupCardTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
                 android:layout_weight="6"
                 android:text="@string/wifi_setup_wizard_title"/>
 

res/layout-sw600dp/setup_preference.xml

@@ -15,9 +15,7 @@
     limitations under the License.
 -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -28,12 +26,12 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="@drawable/setup_illustration_bg"
-        android:foreground="@drawable/setup_illustration_wifi_wide"
-        settings:aspectRatio="4.0">
+        android:foreground="@drawable/setup_illustration_wifi_wide">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/setup_wizard_tablet_illustration_height"
             android:orientation="vertical"
             android:paddingLeft="@dimen/setup_wizard_card_port_margin_sides"
             android:paddingRight="@dimen/setup_wizard_card_port_margin_sides">

res/values-land/dimens.xml

@@ -45,7 +45,6 @@
     <!-- Dashboard tile image margin start / end -->
     <dimen name="dashboard_tile_image_margin_start">12dp</dimen>
 
-    <dimen name="setup_wizard_card_title_margin_top">256dp</dimen>
     <dimen name="setup_wizard_card_title_padding_end">32dp</dimen>
     <dimen name="setup_wizard_card_title_padding_start">56dp</dimen>
     <dimen name="setup_wizard_card_title_padding_top">24dp</dimen>

res/values/dimens.xml

@@ -50,7 +50,7 @@
     <dimen name="setup_add_network_item_height">56dp</dimen>
     <dimen name="setup_wizard_card_corner_radius">2dp</dimen>
     <dimen name="setup_wizard_card_elevation">5dp</dimen>
-    <dimen name="setup_wizard_card_title_margin_top">0dp</dimen>
+    <dimen name="setup_wizard_tablet_illustration_height">256dp</dimen>
     <dimen name="setup_wizard_card_title_padding_end">0dp</dimen>
     <dimen name="setup_wizard_card_title_padding_start">0dp</dimen>
     <dimen name="setup_wizard_card_title_padding_top">16dp</dimen>

res/values/styles.xml

@@ -176,7 +176,6 @@
 
     <!-- Alternate title style used for some tablet layouts -->
     <style name="SetupCardTitle">
-        <item name="android:layout_marginTop">@dimen/setup_wizard_card_title_margin_top</item>
         <item name="android:paddingBottom">@dimen/setup_wizard_card_title_padding_bottom</item>
         <item name="android:paddingEnd">@dimen/setup_wizard_card_title_padding_end</item>
         <item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</item>