summaryrefslogtreecommitdiffstats
path: root/res/layout-xlarge
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout-xlarge')
-rw-r--r--res/layout-xlarge/date_time_settings_setupwizard.xml180
-rw-r--r--res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml190
2 files changed, 200 insertions, 170 deletions
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml
index de2065b..0b5d6bf 100644
--- a/res/layout-xlarge/date_time_settings_setupwizard.xml
+++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -13,27 +13,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- TODO: too many LinearLayout. -->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="60dip"
- android:paddingLeft="100dip"
- android:paddingRight="100dip"
- android:paddingBottom="40dip">
+ android:paddingTop="96dip"
+ android:paddingLeft="128dip"
+ android:paddingRight="128dip"
+ android:paddingBottom="96dip">
<!-- 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="40dip"
+ android:textSize="30dip"
android:textColor="#FF99cc00"
- android:text="@string/date_and_time_settings_title"/>
+ android:text="@string/date_and_time_settings_title"
+ android:gravity="center_vertical" />
<!-- Divider -->
<View
@@ -41,111 +43,105 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_below="@id/title"
- android:background="@color/divider_color"
- android:layout_marginBottom="5dip" />
+ android:background="@color/divider_color" />
+
+ <!-- timezone -->
+ <Button
+ android:id="@+id/time_zone_button"
+ style="?android:attr/dropDownSpinnerStyle"
+ android:layout_width="304dip"
+ android:layout_height="48dip"
+ android:layout_below="@id/top_divider"
+ android:layout_marginTop="48dip"
+ android:layout_marginLeft="16dip"
+ android:paddingLeft="16dip"
+ android:paddingTop="0dip"
+ android:paddingBottom="0dip"
+ android:gravity="left|center"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
- android:layout_width="match_parent"
+ android:id="@+id/date_time_auto"
+ android:layout_width="624dip"
android:layout_height="wrap_content"
+ android:orientation="vertical"
android:layout_below="@id/top_divider"
- android:layout_alignParentLeft="true"
- android:layout_marginTop="60dip"
- android:orientation="horizontal">
+ android:layout_alignParentRight="true"
+ android:layout_marginTop="32dip"
+ android:layout_marginRight="16dip"
+ android:layout_marginBottom="48dip">
- <!-- left: timezone -->
- <LinearLayout
- android:layout_width="0px"
- android:layout_weight=".48"
+ <Switch
+ android:id="@+id/date_time_auto_button"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
- <!-- text should manually be set. -->
- <Button
- android:id="@+id/time_zone_button"
- android:layout_width="400dip"
- android:layout_height="60dip"
- android:textSize="24dip" />
- <!-- <LinearLayout android:id="@+id/zone_picker"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="350dip"
- android:gravity="center"
- android:visibility="gone"
- android:clickable="true">
- <fragment android:id="@+id/zone_picker_fragment"
- class="com.android.settings.ZonePicker"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content" />
- </LinearLayout> -->
- </LinearLayout>
-
- <!-- spacer on center -->
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:text="@string/date_time_auto"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <!-- Divider -->
<View
- android:layout_width="0px"
- android:layout_weight=".04"
- android:layout_height="0dip"
- android:visibility="invisible" />
-
- <!-- right: DateTime -->
- <RelativeLayout
- android:layout_width="0px"
- android:layout_weight=".48"
- android:layout_height="wrap_content">
-
- <CheckBox
- android:id="@+id/date_time_auto"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:gravity="left"
- android:textSize="22dip"
- android:text="@string/date_time_auto" />
-
- <!-- Divider -->
- <View
- android:id="@+id/datetime_divider"
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_below="@id/date_time_auto"
- android:background="@color/divider_color"
- android:layout_marginTop="15dip"
- android:layout_marginBottom="80dip" />
-
- <TimePicker
- android:id="@+id/time_picker"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/datetime_divider" />
-
- <DatePicker
- android:id="@+id/date_picker"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@id/datetime_divider" />
-
- </RelativeLayout>
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="@color/divider_color" />
</LinearLayout>
+ <TextView
+ android:id="@+id/date_picker_title"
+ android:layout_width="312dip"
+ android:layout_height="48dip"
+ android:layout_toLeftOf="@+id/time_picker_title"
+ android:layout_below="@id/date_time_auto"
+ android:text="@string/date_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center" />
+
+ <DatePicker
+ android:id="@+id/date_picker"
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:layout_toLeftOf="@+id/time_picker"
+ android:layout_below="@id/date_picker_title" />
+
+ <TextView
+ android:id="@+id/time_picker_title"
+ android:layout_width="312dip"
+ android:layout_height="48dip"
+ android:layout_below="@id/date_time_auto"
+ android:layout_alignParentRight="true"
+ android:text="@string/time_picker_title"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center" />
+
+ <TimePicker
+ android:id="@+id/time_picker"
+ android:layout_width="312dip"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_below="@id/time_picker_title" />
+
<!-- TODO: remove this button when we are sure it is needless -->
<Button
android:id="@+id/skip_button"
- android:layout_width="250dip"
- android:layout_height="80dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/next_button"
- android:layout_marginRight="20dip"
- android:textSize="24dip"
+ android:layout_marginRight="16dip"
android:text="@string/skip_label"
android:visibility="gone" />
<Button
android:id="@+id/next_button"
- android:layout_width="250dip"
- android:layout_height="80dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
- android:textSize="24dip"
- android:text="@string/next_label" />
+ android:layout_marginRight="16dip"
+ android:text="@string/next_label"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index e438fab..e44b09c 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -13,91 +13,118 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<RelativeLayout
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="100dip"
- android:paddingRight="100dip"
- android:paddingBottom="40dip">
+ android:paddingTop="120dip"
+ android:paddingLeft="96dip"
+ android:paddingRight="96dip"
+ android:paddingBottom="0dip" >
- <TextView
- android:id="@+id/wifi_setup_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:textSize="40dip"
- android:textColor="#FF99cc00"
- android:text="@string/wifi_setup_title"/>
-
- <ProgressBar
- android:id="@+id/scanning_progress_bar"
- android:layout_width="100dip"
+ <RelativeLayout
+ android:id="@+id/title_bar"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/scanning_progress_text"
- android:layout_alignParentRight="true"
- style="?android:attr/progressBarStyleHorizontal" />
+ android:minHeight="48dip"
+ android:layout_alignParentTop="true">
- <TextView
- android:id="@+id/scanning_progress_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_above="@+id/top_divider"
- android:gravity="right"
- android:textSize="22dip"
- android:textColor="#ff40520f" />
+ <TextView
+ android:id="@+id/wifi_setup_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="16dip"
+ android:textSize="30dip"
+ android:textColor="#FF99cc00"
+ android:text="@string/wifi_setup_title"/>
+
+ <TextView
+ android:id="@+id/scanning_progress_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="16dip"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#6699cc00" />
+ </RelativeLayout>
<!-- Divider -->
- <View
+ <RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_below="@id/wifi_setup_title"
- android:background="@color/divider_color"
- android:layout_marginBottom="5dip" />
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title_bar">
+ <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/divider"
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_alignBottom="@id/scanning_progress_bar"
+ android:background="@color/divider_color" />
+ </RelativeLayout>
<TextView
android:id="@+id/wifi_setup_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
- android:layout_marginBottom="20dip"
- android:layout_marginLeft="5dip"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:text="@string/wifi_setup_status_select_network"/>
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="16dip"
+ android:layout_marginTop="32dip"
+ android:layout_marginBottom="0dip"
+ android:text="@string/wifi_setup_status_select_network"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
<FrameLayout
- android:id="@+id/wifi_setup"
- android:layout_width="400dip"
+ android:id="@+id/content"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:minHeight="138dip"
+ android:layout_below="@+id/wifi_setup_status"
android:layout_alignParentLeft="true"
- android:layout_below="@+id/wifi_setup_status">
- <fragment
- class="com.android.settings.wifi.WifiSettings"
- android:id="@+id/wifi_setup_fragment"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_marginTop="0dip"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_marginBottom="0dip">
+
+ <FrameLayout
+ android:id="@+id/wifi_setup"
+ android:layout_width="416dip"
+ android:layout_height="383dip"
+ android:paddingTop="16dip">
+ <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="416dip"
+ android:layout_height="wrap_content"
+ android:paddingTop="32dip"
+ android:visibility="gone" />
</FrameLayout>
- <FrameLayout
- android:id="@+id/wifi_config_ui"
- android:layout_width="400dip"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/wifi_setup_status"
- android:visibility="gone" />
+ <!-- TODO: should be removed -->
<Button android:id="@+id/wifi_setup_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/wifi_config_ui"
android:layout_alignLeft="@id/wifi_config_ui"
- android:textSize="18dip"
- android:text="@string/wifi_setup_detail"
android:gravity="left|center_vertical"
+ android:text="@string/wifi_setup_detail"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" />
<LinearLayout
@@ -106,55 +133,62 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentRight="true"
- android:layout_alignParentBottom="true">
+ android:layout_marginRight="16dip"
+ android:layout_alignBottom="@+id/content"
+ android:layout_marginBottom="16dip">
<Button android:id="@+id/wifi_setup_forget"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:textSize="24dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_forget"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_connect"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:layout_marginTop="20dip"
- android:textSize="24dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:layout_marginTop="96dip"
+ android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_connect"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_add_network"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:textSize="24dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_add_network"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" />
<Button android:id="@+id/wifi_setup_refresh_list"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:textSize="24dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_refresh_list"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" />
<Button android:id="@+id/wifi_setup_skip_or_next"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:layout_marginTop="30dip"
- android:textSize="24dip"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:layout_marginTop="96dip"
+ android:layout_marginLeft="16dip"
android:text="@string/wifi_setup_skip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:enabled="false" />
</LinearLayout>
<!-- This misleading name is for keeping consistency between non-XL layouts -->
<Button android:id="@+id/wifi_setup_cancel"
- android:layout_width="260dip"
- android:layout_height="60dip"
- android:layout_marginTop="20dip"
- android:layout_alignParentBottom="true"
+ android:layout_width="208dip"
+ android:layout_height="48dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_marginBottom="16dip"
+ android:layout_alignBottom="@+id/content"
android:layout_toLeftOf="@id/right_buttons"
- android:textSize="24dip"
android:text="@string/wifi_setup_back"
android:visibility="gone" />
</RelativeLayout>
generated by cgit v1.1 at 2025-08-25 09:28:05 +0000