summaryrefslogtreecommitdiffstats
path: root/res/layout-sw600dp
diff options
context:
space:
mode:
authorFreeman Ng <tenorslowworm@google.com>2011-05-25 21:13:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-25 21:13:03 -0700
commitd671182d88a193bee25d82a1941a57a84ed0fdc4 (patch)
treeba449be29e8f51b42939446c393199f5e00697ca /res/layout-sw600dp
parent3c110e500dad9dc21ae7efa13a73f1876aa38cee (diff)
parentedb03bf537063f466a7fee48341b90ed8f9f90af (diff)
downloadpackages_apps_Settings-d671182d88a193bee25d82a1941a57a84ed0fdc4.zip
packages_apps_Settings-d671182d88a193bee25d82a1941a57a84ed0fdc4.tar.gz
packages_apps_Settings-d671182d88a193bee25d82a1941a57a84ed0fdc4.tar.bz2
Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r--res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml29
-rw-r--r--res/layout-sw600dp/date_time_settings_setupwizard.xml168
-rw-r--r--res/layout-sw600dp/settings_top_level.xml33
-rw-r--r--res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml238
4 files changed, 468 insertions, 0 deletions
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
new file mode 100644
index 0000000..4d52deb
--- /dev/null
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2006 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:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:paddingRight="?android:attr/scrollbarSize">
+
+ <LinearLayout android:id="@+android:id/widget_frame"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
new file mode 100644
index 0000000..b31462d
--- /dev/null
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+ -->
+<RelativeLayout
+ android:id="@+id/layout_root"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="@dimen/datetime_margin_top"
+ android:paddingLeft="@dimen/screen_margin_sides"
+ android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingBottom="@dimen/datetime_margin_bottom">
+
+ <!-- Title: Set date & time-->
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="48dip"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="16dip"
+ android:layout_alignParentTop="true"
+ android:textSize="32dip"
+ android:textColor="#FF99cc00"
+ android:text="@string/date_and_time_settings_title_setup_wizard"
+ android:gravity="bottom" />
+
+ <!-- Divider -->
+ <View
+ android:id="@+id/top_divider"
+ android:layout_width="match_parent"
+ android:layout_height="3dip"
+ android:layout_below="@id/title"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="17dip"
+ android:background="@color/divider_color" />
+
+ <RelativeLayout
+ android:id="@+id/timezone_auto_time"
+ android:layout_width="716dip"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_below="@id/top_divider">
+ <!-- timezone -->
+ <Button
+ android:id="@+id/time_zone_button"
+ style="?android:attr/dropDownSpinnerStyle"
+ android:layout_width="304dip"
+ android:layout_height="48dip"
+ android:layout_alignParentLeft="true"
+ android:layout_alignBottom="@+id/date_time_auto"
+ android:gravity="left|center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20dip" />
+
+ <LinearLayout
+ android:id="@+id/date_time_auto"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_toRightOf="@id/time_zone_button"
+ android:layout_marginLeft="32dip"
+ android:layout_alignParentRight="true">
+
+ <Switch
+ android:id="@+id/date_time_auto_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:layout_marginLeft="16dip"
+ android:text="@string/date_time_auto"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20dip" />
+
+ <!-- Divider -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="@color/divider_color" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <LinearLayout
+ android:layout_width="624dip"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_below="@+id/timezone_auto_time"
+ android:layout_marginTop="48dip"
+ android:orientation="horizontal">
+
+ <LinearLayout
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/date_picker_title"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:text="@string/date_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20dip"
+ android:clickable="false"
+ android:longClickable="false"
+ android:gravity="center" />
+ <DatePicker
+ android:id="@+id/date_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/date_picker_title" />
+ </LinearLayout>
+
+ <!-- divider -->
+ <View
+ android:id="@+id/center_divider"
+ android:layout_width="1dip"
+ android:layout_height="match_parent"
+ android:background="@color/divider_color" />
+
+ <LinearLayout
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/time_picker_title"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:text="@string/time_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20dip"
+ android:gravity="center" />
+
+ <TimePicker
+ android:id="@+id/time_picker"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/time_picker_title" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <View
+ android:id="@+id/bottom_divider"
+ android:layout_width="match_parent"
+ android:layout_height="3dip"
+ android:layout_alignLeft="@id/timezone_auto_time"
+ android:layout_above="@+id/next_button"
+ android:layout_marginBottom="16dip"
+ android:background="@color/divider_color" />
+
+ <Button
+ android:id="@+id/next_button"
+ style="@style/setup_wizard_button"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:text="@string/next_label" />
+</RelativeLayout>
diff --git a/res/layout-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
new file mode 100644
index 0000000..09590b1
--- /dev/null
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Top-level Settings layout with fragments. -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <fragment class="com.android.settings.Settings$TopLevelSettings"
+ android:id="@+id/top_level"
+ android:layout_width="0px"
+ android:layout_height="match_parent"
+ android:layout_weight=".4"
+ android:layout_marginRight="10dp"/>
+ <FrameLayout android:id="@+id/prefs"
+ android:layout_width="0px"
+ android:layout_height="match_parent"
+ android:layout_weight=".6" />
+</LinearLayout>
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
new file mode 100644
index 0000000..d6df897
--- /dev/null
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+ -->
+
+<RelativeLayout
+ android:id="@+id/layout_root"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:paddingTop="60dip"
+ android:paddingLeft="@dimen/screen_margin_sides"
+ android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingBottom="0dip" >
+
+ <FrameLayout
+ android:id="@+id/top_padding_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true">
+ <!-- Set to gone when software keyboard appears -->
+ <View
+ android:id="@+id/top_padding"
+ android:layout_width="match_parent"
+ android:layout_height="94dip" />
+ </FrameLayout>
+
+ <TextView
+ android:id="@+id/wifi_setup_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minHeight="48dip"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="16dip"
+ android:layout_below="@id/top_padding_layout"
+ android:textSize="32dip"
+ android:textColor="#ff99cc00"
+ android:text="@string/wifi_setup_title"
+ android:gravity="bottom"/>
+
+ <!-- Divider -->
+ <FrameLayout
+ android:id="@+id/top_divider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/wifi_setup_title">
+ <ProgressBar
+ android:id="@+id/scanning_progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="?android:attr/progressBarStyleHorizontal" />
+ <View
+ android:id="@+id/top_divider_no_progress"
+ android:layout_width="match_parent"
+ android:layout_height="3dip"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="0dip"
+ android:background="@color/divider_color"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <!-- Dummy view to have the left edge of following Views.
+ @id/content needs to have layout_width="match_parent" to accommodate
+ every views inside @id/wifi_config_ui while sometimes config ui becomes
+ very wide. -->
+ <View
+ android:id="@+id/dummy_for_left_edge"
+ android:layout_width="716dip"
+ android:layout_height="0dip"
+ android:layout_below="@id/top_divider"
+ android:layout_centerHorizontal="true" />
+
+ <RelativeLayout
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/top_divider"
+ android:layout_alignLeft="@id/dummy_for_left_edge"
+ android:layout_centerHorizontal="true">
+
+ <!-- Padding for @id/content shown when keyboard isn't available -->
+ <View
+ android:id="@+id/content_padding"
+ android:layout_width="match_parent"
+ android:layout_height="370dip"
+ android:visibility="gone" />
+
+ <FrameLayout
+ android:id="@+id/wifi_settings_fragment_layout"
+ android:layout_width="716dip"
+ android:layout_height="370dip">
+ <fragment
+ class="com.android.settings.wifi.WifiSettings"
+ android:id="@+id/wifi_setup_fragment"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ </FrameLayout>
+ <FrameLayout
+ android:id="@+id/wifi_config_ui"
+ android:layout_width="wrap_content"
+ android:minWidth="406dip"
+ android:layout_height="wrap_content"
+ android:minHeight="160dip"
+ android:layout_marginTop="10dip"
+ android:layout_alignParentLeft="true"
+ android:visibility="gone" />
+ <LinearLayout
+ android:id="@+id/connecting_status_layout"
+ android:layout_width="716dip"
+ android:layout_height="360dip"
+ android:layout_marginTop="10dip"
+ android:visibility="gone">
+ <TextView
+ android:id="@+id/connecting_status"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lineSpacingExtra="10dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp" />
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <!-- Shown when @id/top_divider is using View instead of ProgressBar.
+ We need this padding to place @id/bottom_divider at the same position
+ regardless of @id/top_divider state.
+
+ Detail:
+ When ProgressBar is used in @id/top_divider, we have 7dip implicit
+ padding inside the ProgressBar object, while we don't have the
+ padding when View is used. As a result, all the objects below it
+ including @id/bottom_divider moves up/down in 7dip between those
+ two states. It is WAI for @id/content, but not for the others.
+
+ Note that we cannot let bottom dividers/buttons align with parent's
+ bottom edge using layout_alignParentBottom="true", since we'd like
+ to control bottom margin between @id/bottom_buttons and the edge
+ depending on software keyboard is shown/hidden.
+
+ We need to enclose @id/bottom_padding with @id/bottom_padding_layout
+ to let @id/bottom_divider use android:layout_below.
+ android:visibility="gone" really let the object go away,
+ causing @id/bottom_divider to lose the target for android:layout_below.
+ -->
+ <FrameLayout
+ android:id="@+id/bottom_padding_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/content">
+ <View
+ android:id="@+id/bottom_padding"
+ android:layout_width="match_parent"
+ android:layout_height="7dip"
+ android:visibility="gone" />
+ </FrameLayout>
+
+ <!-- Divider -->
+ <View
+ android:id="@+id/bottom_divider"
+ android:layout_width="match_parent"
+ android:layout_height="3dip"
+ android:layout_marginBottom="16dip"
+ android:layout_below="@id/bottom_padding_layout"
+ android:layout_alignLeft="@id/content"
+ android:background="@color/divider_color" /> <!-- TODO: fix this -->
+
+ <LinearLayout
+ android:id="@+id/bottom_buttons"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/bottom_divider"
+ android:layout_alignLeft="@id/bottom_divider">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/bottom_divider"
+ android:layout_alignLeft="@id/bottom_divider"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true">
+
+ <Button
+ android:id="@+id/wifi_setup_add_network"
+ style="@style/setup_wizard_button"
+ android:layout_alignParentLeft="true"
+ android:text="@string/wifi_setup_add_network"
+ android:enabled="false" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:orientation="horizontal">
+
+ <!-- This misleading name is for keeping consistency between non-XL
+ layouts -->
+ <Button android:id="@+id/wifi_setup_cancel"
+ style="@style/setup_wizard_button"
+ android:text="@string/wifi_setup_back"
+ android:visibility="gone" />
+
+ <Button android:id="@+id/wifi_setup_connect"
+ style="@style/setup_wizard_button"
+ android:layout_marginLeft="16dip"
+ android:text="@string/wifi_setup_connect"
+ android:enabled="false"
+ android:visibility="gone" />
+
+ <Button android:id="@+id/wifi_setup_skip_or_next"
+ style="@style/setup_wizard_button"
+ android:layout_marginLeft="16dip"
+ android:text="@string/wifi_setup_skip" />
+ </LinearLayout>
+
+ </RelativeLayout>
+
+ <Button android:id="@+id/wifi_setup_refresh_list"
+ style="@style/setup_wizard_button"
+ android:layout_alignParentRight="true"
+ android:text="@string/wifi_setup_refresh_list"
+ android:enabled="false" />
+
+ </LinearLayout>
+</RelativeLayout>