From 588e61aa055eff73c968e2b8f45b6848bd8f7766 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 27 Jun 2014 19:40:20 -0700
Subject: [WifiSetup] L layout update

Changed the layout based on the new design mocks. Copied over
StickyHeaderListView and SetupWizardHeader. Currently using the
generic illustration but will update to Wifi setup specific version
once we get them.

Change-Id: I22bdef8c9860d419be55938e1e4a6a682db5b7e8
---
 res/drawable-nodpi/grass_tile.jpg        | Bin 0 -> 9702 bytes
 res/drawable-nodpi/illustration_wifi.jpg | Bin 0 -> 58441 bytes
 res/drawable/grass.xml                   |  20 ++++
 res/layout-land/setup_preference.xml     |  63 +++++++++++++
 res/layout/setup_preference.xml          | 156 +++++--------------------------
 res/layout/setup_wifi_add_network.xml    |  32 +++++++
 res/layout/setup_wizard_header.xml       |  35 +++++++
 res/values-sw600dp/dimens.xml            |   7 +-
 res/values/colors.xml                    |   1 +
 res/values/dimens.xml                    |  15 ++-
 res/values/strings.xml                   |   2 +-
 res/values/styles.xml                    |  21 ++++-
 res/values/themes.xml                    |  14 ++-
 13 files changed, 215 insertions(+), 151 deletions(-)
 create mode 100644 res/drawable-nodpi/grass_tile.jpg
 create mode 100644 res/drawable-nodpi/illustration_wifi.jpg
 create mode 100644 res/drawable/grass.xml
 create mode 100644 res/layout-land/setup_preference.xml
 create mode 100644 res/layout/setup_wifi_add_network.xml
 create mode 100644 res/layout/setup_wizard_header.xml

(limited to 'res')

diff --git a/res/drawable-nodpi/grass_tile.jpg b/res/drawable-nodpi/grass_tile.jpg
new file mode 100644
index 0000000..7aef32c
Binary files /dev/null and b/res/drawable-nodpi/grass_tile.jpg differ
diff --git a/res/drawable-nodpi/illustration_wifi.jpg b/res/drawable-nodpi/illustration_wifi.jpg
new file mode 100644
index 0000000..0c03199
Binary files /dev/null and b/res/drawable-nodpi/illustration_wifi.jpg differ
diff --git a/res/drawable/grass.xml b/res/drawable/grass.xml
new file mode 100644
index 0000000..2fb5bd9
--- /dev/null
+++ b/res/drawable/grass.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/grass_tile"
+    android:tileMode="repeat" />
diff --git a/res/layout-land/setup_preference.xml b/res/layout-land/setup_preference.xml
new file mode 100644
index 0000000..e79f5c1
--- /dev/null
+++ b/res/layout-land/setup_preference.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2014 The Android Open Source Project
+
+     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"
+    android:id="@+id/fragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/title_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/grass">
+
+        <TextView
+            android:id="@+id/title"
+            style="@style/SetupTitle"
+            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:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/wifi_required_info_text"
+        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" />
+
+    <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+        android:id="@+id/navigation_bar"
+        style="@style/setup_wizard_navbar_style" />
+
+</LinearLayout>
+
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index c5d686f..46829c0 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -16,142 +16,34 @@
 ** limitations under the License.
 */
 -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fragment"
-    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
-    <view
-        class="com.android.settings.widget.ProportionalOuterFrame"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/wifi_required_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dip"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/wifi_required_info_text"
+        android:visibility="gone" />
+
+    <com.android.settings.widget.StickyHeaderListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent">
+        android:cacheColorHint="@android:color/transparent"
+        android:clipToPadding="false"
+        android:drawSelectorOnTop="false"
+        android:headerDividersEnabled="false"
+        android:scrollbarAlwaysDrawVerticalTrack="true" />
 
-        <RelativeLayout
-            android:id="@+id/title_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:gravity="bottom">
-
-            <LinearLayout
-                android:id="@+id/title_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="bottom"
-                android:orientation="horizontal">
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1.0"
-                    style="@style/SetupTitle"
-                    android:text="@string/wifi_setup_wizard_title"
-                    android:gravity="bottom" />
-
-                <ImageButton
-                    android:id="@+id/more"
-                    android:layout_width="@dimen/setup_button_size"
-                    android:layout_height="@dimen/setup_button_size"
-                    android:layout_marginStart="8dip"
-                    android:layout_marginEnd="8dip"
-                    android:layout_marginBottom="8dip"
-                    android:src="?attr/ic_menu_moreoverflow"
-                    android:background="?android:attr/actionBarItemBackground"
-                    android:contentDescription="@string/wifi_menu_more_options" />
-
-            </LinearLayout>
-
-            <!-- Divider -->
-            <View
-                android:id="@+id/top_divider"
-                style="@style/TopDivider"
-                android:layout_below="@id/title_bar" />
-
-        </RelativeLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/title_area"
-            android:background="@android:color/transparent"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/wifi_required_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="6dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/wifi_required_info_text"
-                android:visibility="gone" />
-
-            <ListView
-                android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="0px"
-                android:layout_weight="1"
-                android:cacheColorHint="@android:color/transparent"
-                android:clipToPadding="false"
-                android:drawSelectorOnTop="false"
-                android:paddingTop="0dip"
-                android:scrollbarAlwaysDrawVerticalTrack="true" />
-
-            <TextView
-                android:id="@android:id/empty"
-                android:layout_width="match_parent"
-                android:layout_height="0px"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/divider"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/setup_item_margin"
-                android:background="@*android:drawable/list_divider_holo_dark" />
-
-            <LinearLayout
-                android:id="@+id/other_network"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/setup_item_margin"
-                android:background="?android:attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:paddingEnd="?android:attr/scrollbarSize" >
-
-                <ImageView
-                    android:id="@+id/add_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:src="?attr/ic_menu_add" />
-
-                <TextView
-                    android:id="@+id/other"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="6dip"
-                    android:layout_marginStart="15dip"
-                    android:layout_marginEnd="6dip"
-                    android:layout_marginTop="6dip"
-                    android:layout_weight="1"
-                    android:ellipsize="marquee"
-                    android:fadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/wifi_other_network" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </view>
     <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
         android:id="@+id/navigation_bar"
-        style="@style/setup_wizard_navbar_style"
-        android:layout_weight="0"
-        />
+        style="@style/setup_wizard_navbar_style" />
+
 </LinearLayout>
diff --git a/res/layout/setup_wifi_add_network.xml b/res/layout/setup_wifi_add_network.xml
new file mode 100644
index 0000000..c62f983
--- /dev/null
+++ b/res/layout/setup_wifi_add_network.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     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"
+    android:id="@+id/other_network"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/setup_add_network_item_height"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
+
+    <TextView
+        style="@style/SetupAddWifiNetwork"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="@string/wifi_other_network" />
+
+</LinearLayout>
diff --git a/res/layout/setup_wizard_header.xml b/res/layout/setup_wizard_header.xml
new file mode 100644
index 0000000..e2e2b0e
--- /dev/null
+++ b/res/layout/setup_wizard_header.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     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.
+-->
+
+<com.android.settings.widget.SetupWizardHeader
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    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:tag="stickyContainer">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/SetupTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:tag="sticky"
+        android:text="@string/wifi_setup_wizard_title"/>
+
+</com.android.settings.widget.SetupWizardHeader>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index ffd6ac0..d35d973 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,12 +24,7 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
-    <dimen name="setup_title_size">60dp</dimen>
-    <item type="dimen" name="setup_title_height">20%</item>
-    <item type="dimen" name="setup_border_width">10%</item>
-    <dimen name="setup_margin_bottom">0dip</dimen>
-    <dimen name="setup_button_size">48dip</dimen>
-    <dimen name="setup_item_margin">32dip</dimen>
+    <dimen name="setup_title_size">24sp</dimen>
     <dimen name="appwidget_min_width">325dip</dimen>
     <dimen name="appwidget_min_height">50dip</dimen>
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ed1b3d3..0b3ea39 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -39,6 +39,7 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color_dark">#33ffffff</color>
     <color name="setup_divider_color_light">#33000000</color>
+    <color name="setup_add_wifi_network_text_color">#ff009587</color>
 
     <color name="circle_avatar_frame_color">#ffffffff</color>
     <color name="circle_avatar_frame_shadow_color">#80000000</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 992e57f..969f575 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -38,12 +38,17 @@
 
     <dimen name="crypt_clock_size">100sp</dimen>
 
-    <item type="dimen" name="setup_title_height">15%</item>
-    <item type="dimen" name="setup_border_width">5%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
-    <dimen name="setup_title_size">25dp</dimen>
-    <dimen name="setup_button_size">32dip</dimen>
-    <dimen name="setup_item_margin">16dip</dimen>
+    <dimen name="setup_title_size">24sp</dimen>
+    <dimen name="setup_title_margin_bottom">16dp</dimen>
+    <!-- This is the extra spacing required to make the leading exactly 32sp -->
+    <dimen name="setup_title_line_spacing_extra">3.67sp</dimen>
+    <dimen name="setup_title_padding_bottom">2dp</dimen>
+    <dimen name="setup_title_padding_top">16dp</dimen>
+    <!-- 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_margin_sides">40dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf975e2..d4ee72f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1372,7 +1372,7 @@
     <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
     <string name="wifi_empty_list_user_restricted">You don\'t have permission to change the Wi\u2011Fi network.</string>
     <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
-    <string name="wifi_other_network">Other network\u2026</string>
+    <string name="wifi_other_network">Add another network</string>
     <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
     <string name="wifi_more">More</string>
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0f7e652..cea615e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -152,11 +152,26 @@
     </style>
 
     <style name="SetupTitle">
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textSize">@dimen/setup_title_size</item>
-        <item name="android:textColor">@color/title_color</item>
+        <item name="android:layout_marginBottom">@dimen/setup_title_margin_bottom</item>
+        <item name="android:layout_marginEnd">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:layout_marginStart">@dimen/setup_wizard_margin_sides</item>
         <item name="android:clickable">false</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:lineSpacingExtra">@dimen/setup_title_line_spacing_extra</item>
         <item name="android:longClickable">false</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textSize">@dimen/setup_title_size</item>
+        <item name="android:paddingBottom">@dimen/setup_title_padding_bottom</item>
+        <item name="android:paddingTop">@dimen/setup_title_padding_top</item>
+    </style>
+
+    <style name="SetupAddWifiNetwork">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:paddingStart">@dimen/setup_list_no_icon_padding</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textAppearance">@android:style/TextAppearance.Small</item>
+        <item name="android:textColor">@color/setup_add_wifi_network_text_color</item>
     </style>
 
     <style name="wifi_item">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3583f84..4e80612 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,29 +22,35 @@
     <attr name="wifi_signal" format="reference" />
 
     <style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
+        <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
-        <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_dark</item>
         <item name="setup_divider_color">@color/setup_divider_color_dark</item>
-        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
         <item name="switchBarMarginStart">0dip</item>
         <item name="switchBarMarginEnd">0dip</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
     </style>
 
     <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
+        <item name="android:windowBackground">?android:attr/colorBackground</item>
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
-        <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
         <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
         <item name="ic_wps">@drawable/ic_wps_light</item>
         <item name="setup_divider_color">@color/setup_divider_color_light</item>
-        <item name="wifi_signal">@drawable/wifi_signal_light</item>
         <item name="switchBarMarginStart">0dip</item>
         <item name="switchBarMarginEnd">0dip</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
     </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
-- 
cgit v1.1