[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

3 files changed, 91 insertions, 132 deletions

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>