[WifiSetup] Use setup navigation bar
Use the setup navigation bar in wifi setup activity.
1. Include frameworks/opt/setupwizard/navigationbar/common.mk in the
make file.
2. Make WifiSetupActivity implement NavigationBarListener
3. Added the fragment in setup_preference.xml, wrapping the whole
screen in a LinearLayout
4. Moved skip and next screen logic to WifiSetupActivity, refactored
the skip dialogs into a fragment
Change-Id: Ia973c0a61faa3ead201bd10d5aa8de4bc6e091c1
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index dc6130d..195214f 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -16,177 +16,189 @@
** limitations under the License.
*/
-->
-<view
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.settings.widget.ProportionalOuterFrame"
+ android:id="@+id/fragment"
+ android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent">
-
- <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
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ <view
+ class="com.android.settings.widget.ProportionalOuterFrame"
+ android:layout_weight="1"
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>
+ android:layout_width="match_parent">
<RelativeLayout
- android:id="@+id/button_bar"
+ android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone" >
-
- <Button
- android:id="@+id/back_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_back" />
-
- <Button
- android:id="@+id/custom_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_skip" />
+ android:layout_alignParentTop="true"
+ android:gravity="bottom">
<LinearLayout
- android:layout_width="wrap_content"
+ android:id="@+id/title_bar"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:orientation="horizontal" >
-
- <Button
- android:id="@+id/skip_button"
- android:layout_width="150dip"
+ android:gravity="bottom"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_skip"
- android:visibility="gone" />
+ android:layout_weight="1.0"
+ style="@style/SetupTitle"
+ android:text="@string/wifi_setup_wizard_title"
+ android:gravity="bottom" />
- <Button
- android:id="@+id/next_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_next"
- android:visibility="gone" />
- </LinearLayout>
+ <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>
-</view>
+
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ 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>
+
+ <RelativeLayout
+ android:id="@+id/button_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:visibility="gone" >
+
+ <Button
+ android:id="@+id/back_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_margin="5dip"
+ android:text="@string/wifi_setup_back" />
+
+ <Button
+ android:id="@+id/custom_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_margin="5dip"
+ android:text="@string/wifi_setup_skip" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:orientation="horizontal" >
+
+ <Button
+ android:id="@+id/skip_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:text="@string/wifi_setup_skip"
+ android:visibility="gone" />
+
+ <Button
+ android:id="@+id/next_button"
+ android:layout_width="150dip"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dip"
+ android:text="@string/wifi_setup_next"
+ android:visibility="gone" />
+ </LinearLayout>
+ </RelativeLayout>
+ </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"
+ />
+</LinearLayout>