[WifiSetup] Tablet portrait layout

Bug: 17134016
Change-Id: I376797ceeeb467af52f6e0a2e45ad6e2523c7b26

diff --git a/res/drawable/setup_wizard_card_bg.xml b/res/drawable/setup_wizard_card_bg.xml
new file mode 100644 (file)
index 0000000..8621437
--- /dev/null
+++ b/res/drawable/setup_wizard_card_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topLeftRadius="@dimen/setup_wizard_card_corner_radius"
+        android:topRightRadius="@dimen/setup_wizard_card_corner_radius" />
+
+    <solid android:color="?android:attr/colorBackground" />
+
+</shape>
+

diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
index 0943817..3d4db3d 100644 (file)
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ b/res/layout-sw600dp-land/setup_preference.xml
@@ -37,14 +37,17 @@
             <TextView
                 android:id="@+id/title"
                 style="@style/SetupCardTitle"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="6"
                 android:text="@string/wifi_setup_wizard_title"/>
 
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/setup_wizard_card_margin_top"
+                android:layout_marginTop="@dimen/setup_wizard_card_land_margin_top"
                 android:layout_weight="8"
-                android:background="?android:attr/colorBackground"
+                android:background="@drawable/setup_wizard_card_bg"
                 android:elevation="@dimen/setup_wizard_card_elevation"
                 android:orientation="vertical">
 

diff --git a/res/layout-sw720dp-port/setup_preference.xml b/res/layout-sw720dp-port/setup_preference.xml
new file mode 100644 (file)
index 0000000..8d1f53b
--- /dev/null
+++ b/res/layout-sw720dp-port/setup_preference.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2014 Google Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.android.settings.widget.SetupWizardIllustration
+        android:id="@+id/title_area"
+        android:layout_width="match_parent"
+        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">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/setup_wizard_card_port_margin_sides"
+            android:paddingRight="@dimen/setup_wizard_card_port_margin_sides">
+
+            <TextView
+                android:id="@+id/title"
+                style="@style/SetupCardTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/wifi_setup_wizard_title" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:background="@drawable/setup_wizard_card_bg"
+                android:elevation="@dimen/setup_wizard_card_elevation"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/wifi_required_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="6dp"
+                    android:text="@string/wifi_required_info_text"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:visibility="gone" />
+
+                <ListView
+                    android:id="@android:id/list"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:cacheColorHint="@android:color/transparent"
+                    android:clipToPadding="false"
+                    android:drawSelectorOnTop="false"
+                    android:headerDividersEnabled="false"
+                    android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.android.settings.widget.SetupWizardIllustration>
+
+    <fragment
+        android:id="@+id/navigation_bar"
+        android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        style="@style/setup_wizard_navbar_style" />
+
+</LinearLayout>
+

diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 79529e2..1aa4b55 100755 (executable)
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -45,4 +45,10 @@
     <!-- 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>
+    <dimen name="setup_wizard_card_title_padding_bottom">0dp</dimen>
+
 </resources>

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 865b029..bbe62a5 100755 (executable)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -48,12 +48,15 @@
     <!-- Size of padding to give in the wifi list when there is no icon -->
     <dimen name="setup_list_no_icon_padding">56dp</dimen>
     <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_margin_top">128dp</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>
+    <dimen name="setup_wizard_card_title_margin_top">0dp</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>
+    <dimen name="setup_wizard_card_title_padding_bottom">28dp</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_margin_sides">40dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1b08e0f..3f5f39d 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -174,15 +174,17 @@
         <item name="android:paddingTop">@dimen/setup_title_padding_top</item>
     </style>
 
-    <!-- Alternate title style used for some tablet-landscape layouts -->
-    <style name="SetupCardTitle" parent="@android:style/TextAppearance.Material.Display1">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
+    <!-- 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:layout_weight">6</item>
-        <item name="android:paddingStart">@dimen/setup_wizard_card_title_padding_start</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>
         <item name="android:paddingTop">@dimen/setup_wizard_card_title_padding_top</item>
+        <item name="android:textAppearance">@style/TextAppearance.SetupWizardCardTitle</item>
+    </style>
+
+    <style name="TextAppearance.SetupWizardCardTitle" parent="@android:style/TextAppearance.Material.Display1">
         <item name="android:textColor">@android:color/white</item>
     </style>