diff options
Diffstat (limited to 'res/layout')
27 files changed, 680 insertions, 363 deletions
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml index 80f78a6..24f0df2 100644 --- a/res/layout/bluetooth_pb_access.xml +++ b/res/layout/bluetooth_pb_access.xml @@ -36,12 +36,12 @@ android:gravity="center_horizontal" android:textAppearance="?android:attr/textAppearanceMedium" /> - <CheckBox android:id="@+id/bluetooth_pb_alwaysallowed" + <CheckBox android:id="@+id/bluetooth_pb_remember_choice" style="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="2dip" - android:text="@string/bluetooth_pb_alwaysallowed" /> + android:text="@string/bluetooth_pb_remember_choice" /> </LinearLayout> diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index 958cc16..cb817c5 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -20,7 +20,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:background="@android:color/background_dark" android:gravity="center_horizontal"> <!-- header text ('Enter Pin') --> diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml index a356315..f932b4e 100644 --- a/res/layout/choose_lock_pattern.xml +++ b/res/layout/choose_lock_pattern.xml @@ -18,8 +18,7 @@ android:id="@+id/topLayout" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="@color/black"> + android:layout_height="match_parent"> <!-- takes up all space above button bar at bottom --> <LinearLayout diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml index 5c6d812..bd100d4 100644 --- a/res/layout/confirm_lock_pattern.xml +++ b/res/layout/confirm_lock_pattern.xml @@ -18,8 +18,7 @@ android:id="@+id/topLayout" android:orientation="vertical" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="@color/black"> + android:layout_height="match_parent"> <TextView android:id="@+id/headerText" android:layout_width="match_parent" diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml index 60dcf6a..a7799fc 100644 --- a/res/layout/crypt_keeper_password_entry.xml +++ b/res/layout/crypt_keeper_password_entry.xml @@ -34,12 +34,12 @@ <EditText android:id="@+id/passwordEntry" android:layout_height="wrap_content" android:layout_width="match_parent" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" android:singleLine="true" - android:textStyle="normal" android:inputType="textPassword" - android:textSize="24sp" + android:textSize="18sp" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="#ffffffff" /> <!-- Emergency call button. @@ -47,8 +47,8 @@ <Button android:id="@+id/emergencyCallButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginTop="10dip" + android:layout_gravity="center" + android:layout_marginTop="16dip" style="@*android:style/Widget.Button.Transparent" android:textSize="14sp" android:drawablePadding="6dip" diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml index f8e3a1a..9677c3d 100644 --- a/res/layout/crypt_keeper_progress.xml +++ b/res/layout/crypt_keeper_progress.xml @@ -18,20 +18,17 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="60dip" - android:paddingLeft="128dip" - android:paddingRight="128dip" - android:paddingBottom="0dip" + android:padding="16dip" android:orientation="vertical" > <TextView + android:id="@+id/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:textSize="30dip" android:textColor="#ff99cc00" android:text="@string/crypt_keeper_setup_title" @@ -51,14 +48,32 @@ style="?android:attr/progressBarStyleHorizontal" /> </RelativeLayout> - - + + <TextView android:id="@+id/status" + android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + + <ImageView + android:id="@+id/encroid" + android:layout_width="wrap_content" android:layout_height="0dip" android:layout_weight="1" - android:layout_marginLeft="16dip" + android:layout_gravity="bottom|right" + android:src="@drawable/encroid_waiting" + /> + + <Button + android:id="@+id/factory_reset" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="32dip" + android:layout_gravity="center" + android:text="@string/master_clear_button_text" + android:visibility="gone" /> </LinearLayout> diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index d106c69..b830b57 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -91,7 +91,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dip" - android:textSize="22sp" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" + android:textSize="18sp" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/enter_password" android:drawableLeft="@*android:drawable/ic_lock_idle_lock" diff --git a/res/layout/custom_preference_list_fragment.xml b/res/layout/custom_preference_list_fragment.xml deleted file mode 100644 index 4803639..0000000 --- a/res/layout/custom_preference_list_fragment.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?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. ---> - -<!-- Based on preference_list_fragment.xml in framework --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:background="@android:color/transparent"> - - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="0dip" - android:paddingBottom="@*android:dimen/preference_fragment_padding_bottom" - android:paddingLeft="@*android:dimen/preference_fragment_padding_side" - android:paddingRight="@*android:dimen/preference_fragment_padding_side" - android:clipToPadding="false" - android:drawSelectorOnTop="false" - android:cacheColorHint="@android:color/transparent" - android:scrollbarAlwaysDrawVerticalTrack="true" /> - - <TextView android:id="@+id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="5dip" - android:gravity="center" - android:visibility="gone" /> -</LinearLayout> diff --git a/res/layout/data_usage_app_title.xml b/res/layout/data_usage_app_title.xml new file mode 100644 index 0000000..baaa685 --- /dev/null +++ b/res/layout/data_usage_app_title.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 3409d64..2e0cbdd 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -14,13 +14,18 @@ limitations under the License. --> -<com.android.settings.widget.DataUsageChartView +<com.android.settings.widget.ChartDataUsageView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" android:id="@+id/chart" android:layout_width="match_parent" - android:layout_height="220dip" - android:padding="16dip"> + android:layout_height="@dimen/data_usage_chart_height" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:paddingTop="16dip" + android:paddingBottom="16dip" + settings:optimalWidth="@dimen/data_usage_chart_optimalWidth" + settings:optimalWidthWeight="0.4"> <com.android.settings.widget.ChartGridView android:id="@+id/grid" @@ -30,7 +35,7 @@ settings:primaryDrawable="@drawable/data_grid_primary" settings:secondaryDrawable="@drawable/data_grid_secondary" settings:borderDrawable="@drawable/data_grid_border" - settings:labelColor="#24aae1" /> + settings:labelColor="#667bb5" /> <com.android.settings.widget.ChartNetworkSeriesView android:id="@+id/series" @@ -48,7 +53,23 @@ android:layout_gravity="left|bottom" settings:strokeColor="#d88d3a" settings:fillColor="#c0ba7f3e" - settings:fillColorSecondary="#0000" /> + settings:fillColorSecondary="#60ba7f3e" /> + + <com.android.settings.widget.ChartSweepView + android:id="@+id/sweep_left" + android:layout_width="wrap_content" + android:layout_height="match_parent" + settings:sweepDrawable="@drawable/data_sweep_left" + settings:followAxis="horizontal" + settings:neighborMargin="5dip" /> + + <com.android.settings.widget.ChartSweepView + android:id="@+id/sweep_right" + android:layout_width="wrap_content" + android:layout_height="match_parent" + settings:sweepDrawable="@drawable/data_sweep_right" + settings:followAxis="horizontal" + settings:neighborMargin="5dip" /> <com.android.settings.widget.ChartSweepView android:id="@+id/sweep_warning" @@ -56,6 +77,7 @@ android:layout_height="wrap_content" settings:sweepDrawable="@drawable/data_sweep_warning" settings:followAxis="vertical" + settings:neighborMargin="5dip" settings:labelSize="60dip" settings:labelTemplate="@string/data_usage_sweep_warning" settings:labelColor="#f7931d" /> @@ -66,22 +88,9 @@ android:layout_height="wrap_content" settings:sweepDrawable="@drawable/data_sweep_limit" settings:followAxis="vertical" + settings:neighborMargin="5dip" settings:labelSize="60dip" settings:labelTemplate="@string/data_usage_sweep_limit" settings:labelColor="#c01a2c" /> - <com.android.settings.widget.ChartSweepView - android:id="@+id/sweep_left" - android:layout_width="wrap_content" - android:layout_height="match_parent" - settings:sweepDrawable="@drawable/data_sweep_left" - settings:followAxis="horizontal" /> - - <com.android.settings.widget.ChartSweepView - android:id="@+id/sweep_right" - android:layout_width="wrap_content" - android:layout_height="match_parent" - settings:sweepDrawable="@drawable/data_sweep_right" - settings:followAxis="horizontal" /> - -</com.android.settings.widget.DataUsageChartView> +</com.android.settings.widget.ChartDataUsageView> diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml index 225fb4b..459ef6e 100644 --- a/res/layout/data_usage_cycles.xml +++ b/res/layout/data_usage_cycles.xml @@ -19,8 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingLeft="16dip" - android:paddingRight="16dip"> + android:paddingLeft="@*android:dimen/preference_item_padding_side" + android:paddingRight="@*android:dimen/preference_item_padding_side"> <TextView android:layout_width="wrap_content" diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml index 2c8e490..639fcf5 100644 --- a/res/layout/data_usage_detail.xml +++ b/res/layout/data_usage_detail.xml @@ -17,26 +17,75 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/app_detail" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical"> - <TextView - android:id="@+id/app_title" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dip" /> + android:layout_marginLeft="@*android:dimen/preference_item_padding_side" + android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:orientation="horizontal"> - <TextView - android:id="@+id/app_subtitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="16dip" /> + <LinearLayout + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginRight="@*android:dimen/preference_item_padding_inner" + android:orientation="vertical"> + + <ImageView + android:id="@+id/app_icon" + android:layout_width="48dip" + android:layout_height="48dip" + android:scaleType="centerInside" /> + + <LinearLayout + android:id="@+id/app_titles" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:orientation="vertical" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:textColor="#d88d3a" + android:text="@string/data_usage_label_foreground" /> + <TextView + android:id="@+id/app_foreground" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="#d88d3a" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:text="@string/data_usage_label_background" /> + <TextView + android:id="@+id/app_background" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> + + <com.android.settings.widget.PieChartView + android:id="@+id/app_pie_chart" + android:layout_width="160dip" + android:layout_height="160dip" /> + + </LinearLayout> <Button android:id="@+id/app_settings" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dip" + android:layout_marginLeft="@*android:dimen/preference_item_padding_side" + android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:layout_marginTop="16dip" + android:layout_marginBottom="16dip" android:text="@string/data_usage_app_settings" /> <LinearLayout diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index 52f56c1..b27d88f 100644 --- a/res/layout/data_usage_header.xml +++ b/res/layout/data_usage_header.xml @@ -17,7 +17,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:clipChildren="false" + android:clipToPadding="false"> <FrameLayout android:id="@+id/network_switches_container" @@ -39,10 +41,24 @@ android:id="@+id/usage_summary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingLeft="@*android:dimen/preference_item_padding_side" + android:paddingRight="@*android:dimen/preference_item_padding_side" android:paddingTop="8dip" android:paddingBottom="8dip" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + android:paddingLeft="@*android:dimen/preference_item_padding_side" + android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingTop="8dip" + android:paddingBottom="8dip" + android:text="@string/data_usage_empty" android:textAppearance="?android:attr/textAppearanceSmall" /> <include layout="@layout/data_usage_detail" /> diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml index 36f8b4d..d5c2e7f 100644 --- a/res/layout/data_usage_item.xml +++ b/res/layout/data_usage_item.xml @@ -17,11 +17,19 @@ <GridLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingLeft="@*android:dimen/preference_item_padding_side" + android:paddingRight="@*android:dimen/preference_item_padding_side" android:paddingTop="8dip" android:paddingBottom="8dip" - android:columnCount="2"> + android:columnCount="3"> + + <ImageView + android:id="@android:id/icon" + android:layout_width="48dip" + android:layout_height="48dip" + android:layout_rowSpan="2" + android:layout_marginRight="8dip" + android:scaleType="centerInside" /> <TextView android:id="@android:id/title" diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml index 7e68143..b754d0c 100644 --- a/res/layout/data_usage_summary.xml +++ b/res/layout/data_usage_summary.xml @@ -25,11 +25,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <TabWidget - android:id="@android:id/tabs" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include layout="@layout/tab_widget" /> <!-- give an empty content area to make tabhost happy --> <FrameLayout @@ -42,6 +38,9 @@ android:layout_width="match_parent" android:layout_height="0dip" android:layout_weight="1" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" + android:clipChildren="false" + android:clipToPadding="false" android:smoothScrollbar="false" /> </LinearLayout> diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications.xml index 95d4847..7df2f54 100755 --- a/res/layout/manage_applications.xml +++ b/res/layout/manage_applications.xml @@ -29,7 +29,8 @@ <ListView android:id="@android:id/list" android:drawSelectorOnTop="false" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle" /> <TextView android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/manage_apps_tab_content.xml index 0391a9d..3898227 100644 --- a/res/layout/manage_apps_tab_content.xml +++ b/res/layout/manage_apps_tab_content.xml @@ -28,28 +28,14 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - <HorizontalScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:scrollbars="none"> - - <TabWidget - android:id="@android:id/tabs" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - /> - - </HorizontalScrollView> + + <include layout="@layout/tab_widget" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" android:layout_height="0dip" - android:layout_weight="1"/> + android:layout_weight="1" /> </LinearLayout> </TabHost> - diff --git a/res/layout/zeroclick.xml b/res/layout/ndefpush.xml index d039e89..6892850 100644 --- a/res/layout/zeroclick.xml +++ b/res/layout/ndefpush.xml @@ -30,15 +30,24 @@ android:layout_height="wrap_content" android:orientation="vertical"> - <TextView android:id="@+id/zeroclick_explained" + <TextView android:id="@+id/ndef_push_explained" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dip" android:gravity="top" - android:text="@string/zeroclick_explained" + android:text="@string/ndef_push_explained" + /> + <ImageView android:id="@+id/ndef_push_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + <TextView android:id="@+id/ndef_push_safety" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dip" + android:gravity="top" + android:text="@string/ndef_push_top" /> - - </LinearLayout> </ScrollView> diff --git a/res/layout/preference.xml b/res/layout/preference.xml index 06d8f24..aef21a1 100644 --- a/res/layout/preference.xml +++ b/res/layout/preference.xml @@ -19,17 +19,16 @@ android:layout_height="wrap_content" android:minHeight="48dip" android:gravity="center_vertical" + android:paddingLeft="@*android:dimen/preference_item_padding_side" android:paddingRight="?android:attr/scrollbarSize" android:background="?android:attr/selectableItemBackground"> <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="15dip" - android:layout_marginRight="6dip" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:layout_weight="1"> + android:layout_weight="1" + android:paddingTop="6dip" + android:paddingBottom="6dip"> <TextView android:id="@+android:id/title" diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml index bd437a9..e10c65f 100644 --- a/res/layout/preference_bluetooth.xml +++ b/res/layout/preference_bluetooth.xml @@ -19,13 +19,6 @@ android:layout_height="wrap_content" android:gravity="center_vertical"> - <LinearLayout android:id="@+id/profileIcons" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - /> - <!-- Divider --> <ImageView android:id="@+id/divider" diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml index 5aebedc..2c83f12 100644 --- a/res/layout/preference_dialog_ringervolume.xml +++ b/res/layout/preference_dialog_ringervolume.xml @@ -32,104 +32,161 @@ android:paddingTop="20dip" android:visibility="gone"/> - <TextView - android:id="@+id/ringtone_label" - android:layout_width="match_parent" + <!-- Dummy --> + <SeekBar android:id="@*android:id/seekbar" + android:layout_width="0dip" android:layout_height="wrap_content" - android:text="@string/incoming_call_volume_title" - android:paddingTop="10dip" - android:paddingLeft="20dip" - android:paddingRight="20dip" /> + android:layout_weight="1" + android:visibility="gone" /> - <!-- Used for the ring volume. This is what the superclass VolumePreference uses. --> - <!-- TODO - is this used? --> - <SeekBar android:id="@*android:id/seekbar" - android:layout_width="match_parent" + <TextView + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingLeft="20dip" - android:paddingRight="20dip" /> + android:paddingLeft="16dip" + android:layout_gravity="left" + android:text="@string/volume_media_description" + /> <!-- Used for the media volume --> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingLeft="8dip" android:orientation="horizontal" android:gravity="center_vertical"> - <ImageView android:id="@+id/volume_mute_button" + <ImageView android:id="@+id/media_mute_button" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:padding="16dip" + android:background="?android:attr/selectableItemBackground" + /> <SeekBar android:id="@+id/media_volume_seekbar" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:paddingTop="2dip" - android:paddingLeft="20dip" - android:paddingRight="20dip" /> + android:layout_marginRight="@dimen/volume_seekbar_side_margin" /> </LinearLayout> - <!-- TODO - is this used? --> - <CheckBox android:id="@+id/same_notification_volume" + <!-- Used for the ringer/notification volume --> + <LinearLayout + android:id="@+id/ringer_section" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/checkbox_notification_same_as_incoming_call" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginTop="6dip" - android:layout_marginLeft="20dip" - android:layout_marginRight="20dip" /> + android:orientation="vertical"> + + <TextView + android:id="@+id/ringer_description_text" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:paddingLeft="16dip" + android:layout_gravity="left" + android:text="@string/volume_ring_description" + /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="8dip" + android:orientation="horizontal" + android:gravity="center_vertical"> + + <ImageView android:id="@+id/ringer_mute_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="16dip" + android:background="?android:attr/selectableItemBackground" + /> + + <SeekBar android:id="@+id/ringer_volume_seekbar" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="2dip" + android:layout_marginRight="@dimen/volume_seekbar_side_margin" /> + </LinearLayout> - <View - android:layout_width="match_parent" - android:layout_height="1px" - android:background="#1bffffff" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip"/> + </LinearLayout> <!-- Used for the notification volume --> <LinearLayout + android:id="@+id/notification_section" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView android:id="@+id/notification_mute_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:orientation="vertical"> + + <TextView + android:id="@+id/notification_description_text" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:paddingLeft="16dip" + android:layout_gravity="left" + android:text="@string/volume_notification_description" + /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="8dip" + android:orientation="horizontal" + android:gravity="center_vertical"> + + <ImageView android:id="@+id/notification_mute_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="16dip" + android:background="?android:attr/selectableItemBackground" + /> + + <SeekBar android:id="@+id/notification_volume_seekbar" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="2dip" + android:layout_marginRight="@dimen/volume_seekbar_side_margin" /> + </LinearLayout> - <SeekBar android:id="@+id/notification_volume_seekbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingLeft="20dip" - android:paddingRight="20dip" /> </LinearLayout> - <View - android:layout_width="match_parent" - android:layout_height="1px" - android:background="#1bffffff" - android:layout_marginTop="16dip" - android:layout_marginBottom="16dip"/> + <TextView + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dip" + android:paddingLeft="16dip" + android:layout_gravity="left" + android:text="@string/volume_alarm_description" + /> <!-- Used for the alarm volume --> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:paddingLeft="8dip" + android:orientation="horizontal" + android:gravity="center_vertical"> <ImageView android:id="@+id/alarm_mute_button" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - + android:layout_height="wrap_content" + android:padding="16dip" + android:background="?android:attr/selectableItemBackground" + /> <SeekBar android:id="@+id/alarm_volume_seekbar" - android:layout_width="match_parent" + android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_weight="1" android:paddingTop="2dip" - android:paddingLeft="20dip" - android:paddingRight="20dip" /> + android:layout_marginRight="@dimen/volume_seekbar_side_margin" /> </LinearLayout> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml new file mode 100644 index 0000000..d8b4a75 --- /dev/null +++ b/res/layout/preference_spellchecker.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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/pref_all" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical"> + <LinearLayout + android:id="@+id/pref_left_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_vertical" + android:clickable="true" + android:focusable="true" + android:background="?android:attr/selectableItemBackground"> + <RadioButton + android:id="@+id/pref_radio" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" /> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + <TextView + android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + <TextView + android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textSize="13sp" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="4" /> + </RelativeLayout> + </LinearLayout> + <LinearLayout + android:id="@+id/pref_right_button1" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:clickable="true" + android:focusable="true" + android:background="?android:attr/selectableItemBackground" > + <View + android:layout_width="2dip" + android:layout_height="match_parent" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:background="@android:drawable/divider_horizontal_dark" /> + <ImageView + android:layout_width="40dip" + android:layout_height="fill_parent" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:src="@drawable/ic_sysbar_quicksettings" + android:layout_gravity="center" /> + </LinearLayout> + <View + android:id="@+id/pref_right_separator2" + android:layout_width="2dip" + android:layout_height="match_parent" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:background="@android:drawable/divider_horizontal_dark" /> + <ImageView + android:id="@+id/pref_right_button2" + android:layout_width="40dip" + android:layout_height="fill_parent" + android:paddingLeft="5dip" + android:paddingRight="5dip" + android:src="@drawable/ic_menu_3d_globe" + android:layout_gravity="right" + android:clickable="true" + android:focusable="true" + android:background="?android:attr/selectableItemBackground" /> +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml new file mode 100644 index 0000000..3cbdff4 --- /dev/null +++ b/res/layout/preference_tts_engine.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical"> + <LinearLayout + android:id="@+id/tts_engine_pref" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_vertical" + android:clickable="true" + android:focusable="true" + android:background="?android:attr/selectableItemBackground"> + <RadioButton + android:id="@+id/tts_engine_radiobutton" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginLeft="10dip" + android:layout_marginRight="4dip" + android:layout_gravity="center_vertical" + android:orientation="vertical" + android:clickable="true" /> + <RelativeLayout + android:id="@+id/tts_engine_pref_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="15dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal"/> + <TextView + android:id="@android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textSize="13sp" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="4" /> + </RelativeLayout> + </LinearLayout> + <View + android:layout_width="2dip" + android:layout_height="match_parent" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:background="@android:drawable/divider_horizontal_dark" /> + <ImageView + android:id="@+id/tts_engine_settings" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:paddingLeft="15dip" + android:paddingRight="?android:attr/scrollbarSize" + android:src="@drawable/ic_sysbar_quicksettings" + android:contentDescription="@string/tts_engine_settings_button" + android:layout_gravity="center" + android:clickable="true" + android:focusable="true" + android:background="?android:attr/selectableItemBackground" /> +</LinearLayout> diff --git a/res/layout/tab_indicator_thin_holo.xml b/res/layout/tab_widget.xml index e4c4652..a6adc5d 100644 --- a/res/layout/tab_indicator_thin_holo.xml +++ b/res/layout/tab_widget.xml @@ -14,20 +14,17 @@ limitations under the License. --> -<RelativeLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="0dp" - android:layout_height="48dp" - android:layout_weight="1" - android:background="@*android:drawable/tab_indicator_holo"> +<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="none" + android:fillViewport="true"> - <TextView - android:id="@android:id/title" + <TabWidget + android:id="@android:id/tabs" android:layout_width="match_parent" - android:layout_height="match_parent" - android:singleLine="true" - android:ellipsize="marquee" - android:gravity="center" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:layout_height="wrap_content" + android:orientation="horizontal" + style="?android:attr/tabWidgetStyle" /> -</RelativeLayout> +</HorizontalScrollView> diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml index 05ad35d..5d76312 100755 --- a/res/layout/two_buttons_panel.xml +++ b/res/layout/two_buttons_panel.xml @@ -29,11 +29,10 @@ android:orientation="horizontal"> <Button android:id="@+id/left_button" - android:layout_width="150dip" - android:paddingLeft="6dip" - android:layout_gravity="left" + android:layout_width="120dip" android:layout_weight="0.4" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"/> <!-- Spacer --> <View android:id="@+id/buttons_spacer_left" @@ -43,10 +42,9 @@ android:layout_weight="0.2" /> <Button android:id="@+id/right_button" - android:layout_width="150dip" - android:paddingRight="6dip" - android:layout_gravity="right" + android:layout_width="120dip" android:text="@string/cancel" android:layout_weight="0.4" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"/> </LinearLayout> diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml index b4779e6..841e093 100644 --- a/res/layout/vpn_dialog.xml +++ b/res/layout/vpn_dialog.xml @@ -56,7 +56,7 @@ android:hint="@string/vpn_not_used"/> </LinearLayout> - <LinearLayout android:id="@+id/ipsec_id" + <LinearLayout android:id="@+id/ipsec_psk" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -64,13 +64,7 @@ <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_identifier"/> <EditText style="@style/vpn_value" android:id="@+id/ipsec_identifier" android:hint="@string/vpn_not_used"/> - </LinearLayout> - <LinearLayout android:id="@+id/ipsec_psk" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> <TextView style="@style/vpn_label" android:text="@string/vpn_ipsec_secret"/> <EditText style="@style/vpn_value" android:id="@+id/ipsec_secret" android:password="true"/> diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 47b4e92..1b4d062 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -26,37 +26,6 @@ <LinearLayout android:id="@+id/info" style="@style/wifi_section" /> - <LinearLayout android:id="@+id/setup_fields" - style="@style/wifi_item" - android:visibility="gone"> - - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_network_setup" /> - - <Spinner android:id="@+id/network_setup" - style="@style/wifi_item_content" - android:prompt="@string/wifi_network_setup" - android:entries="@array/wifi_network_setup" /> - - </LinearLayout> - - <LinearLayout android:id="@+id/wps_fields" - style="@style/wifi_item" - android:visibility="gone"> - - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_wps_pin" /> - - <EditText android:id="@+id/wps_pin" - style="@style/wifi_item_content" - android:singleLine="true" - android:inputType="textPassword" /> - - </LinearLayout> - - <LinearLayout android:id="@+id/type" style="@style/wifi_section" android:visibility="gone"> @@ -190,153 +159,197 @@ </LinearLayout> </LinearLayout> - <LinearLayout android:id="@+id/proxy_settings_fields" - style="@style/wifi_item" - android:visibility="gone"> - - <TextView android:id="@+id/proxy_settings_title" - style="@style/wifi_item_label" - android:text="@string/proxy_settings_title" /> - - <Spinner android:id="@+id/proxy_settings" - style="@style/wifi_item_content" - android:prompt="@string/proxy_settings_title" - android:entries="@array/wifi_proxy_settings" /> - </LinearLayout> - - <LinearLayout android:id="@+id/proxy_warning_limited_support" + <LinearLayout android:id="@+id/wifi_advanced_toggle" style="@style/wifi_item" android:visibility="gone"> - <!-- Dummy to enable right-justification of warning --> - <TextView - style="@style/wifi_item_label" /> - - <TextView + <CheckBox android:id="@+id/wifi_advanced_togglebox" style="@style/wifi_item_content" - android:text="@string/proxy_warning_limited_support" /> + android:textSize="14sp" + android:text="@string/wifi_show_advanced" /> </LinearLayout> - <LinearLayout android:id="@+id/proxy_fields" - style="@style/wifi_section" - android:visibility="gone"> + <LinearLayout android:id="@+id/wifi_advanced_fields" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + <LinearLayout android:id="@+id/setup_fields" + style="@style/wifi_item" + android:visibility="gone"> - <LinearLayout style="@style/wifi_item"> <TextView style="@style/wifi_item_label" - android:text="@string/proxy_hostname_label" /> + android:text="@string/wifi_network_setup" /> - <EditText android:id="@+id/proxy_hostname" + <Spinner android:id="@+id/network_setup" style="@style/wifi_item_content" - android:hint="@string/proxy_hostname_hint" - android:inputType="textNoSuggestions" - android:singleLine="true" /> + android:prompt="@string/wifi_network_setup" + android:entries="@array/wifi_network_setup" /> + </LinearLayout> - <LinearLayout style="@style/wifi_item"> + + <LinearLayout android:id="@+id/wps_fields" + style="@style/wifi_item" + android:visibility="gone"> + <TextView style="@style/wifi_item_label" - android:text="@string/proxy_port_label" /> + android:text="@string/wifi_wps_pin" /> - <EditText android:id="@+id/proxy_port" + <EditText android:id="@+id/wps_pin" style="@style/wifi_item_content" - android:hint="@string/proxy_port_hint" - android:inputType="number" - android:singleLine="true" /> + android:singleLine="true" + android:inputType="textPassword" /> + </LinearLayout> - <LinearLayout style="@style/wifi_item"> - <TextView + + <LinearLayout android:id="@+id/proxy_settings_fields" + style="@style/wifi_item" + android:visibility="gone"> + + <TextView android:id="@+id/proxy_settings_title" style="@style/wifi_item_label" - android:text="@string/proxy_exclusionlist_label" /> + android:text="@string/proxy_settings_title" /> - <EditText android:id="@+id/proxy_exclusionlist" + <Spinner android:id="@+id/proxy_settings" style="@style/wifi_item_content" - android:hint="@string/proxy_exclusionlist_hint" - android:inputType="textNoSuggestions" - android:singleLine="true" /> + android:prompt="@string/proxy_settings_title" + android:entries="@array/wifi_proxy_settings" /> </LinearLayout> - </LinearLayout> - <LinearLayout android:id="@+id/ip_fields" - style="@style/wifi_item" - android:visibility="gone"> + <LinearLayout android:id="@+id/proxy_warning_limited_support" + style="@style/wifi_item" + android:visibility="gone"> + <!-- Dummy to enable right-justification of warning --> + <TextView + style="@style/wifi_item_label" /> - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_ip_settings" /> + <TextView + style="@style/wifi_item_content" + android:text="@string/proxy_warning_limited_support" /> + </LinearLayout> - <Spinner android:id="@+id/ip_settings" - style="@style/wifi_item_content" - android:prompt="@string/wifi_ip_settings" - android:entries="@array/wifi_ip_settings" /> + <LinearLayout android:id="@+id/proxy_fields" + style="@style/wifi_section" + android:visibility="gone"> - </LinearLayout> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_hostname_label" /> - <LinearLayout android:id="@+id/staticip" - style="@style/wifi_section" - android:visibility="gone"> - <LinearLayout - style="@style/wifi_item" > - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_ip_address" /> + <EditText android:id="@+id/proxy_hostname" + style="@style/wifi_item_content" + android:hint="@string/proxy_hostname_hint" + android:inputType="textNoSuggestions" + android:singleLine="true" /> + </LinearLayout> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_port_label" /> - <EditText android:id="@+id/ipaddress" - style="@style/wifi_item_content" - android:singleLine="true" - android:hint="@string/wifi_ip_address_hint" - android:inputType="textNoSuggestions" /> + <EditText android:id="@+id/proxy_port" + style="@style/wifi_item_content" + android:hint="@string/proxy_port_hint" + android:inputType="number" + android:singleLine="true" /> + </LinearLayout> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_exclusionlist_label" /> + + <EditText android:id="@+id/proxy_exclusionlist" + style="@style/wifi_item_content" + android:hint="@string/proxy_exclusionlist_hint" + android:inputType="textNoSuggestions" + android:singleLine="true" /> + </LinearLayout> </LinearLayout> - <LinearLayout - style="@style/wifi_item" > + <LinearLayout android:id="@+id/ip_fields" + style="@style/wifi_item" + android:visibility="gone"> + <TextView style="@style/wifi_item_label" - android:text="@string/wifi_gateway" /> + android:text="@string/wifi_ip_settings" /> - <EditText android:id="@+id/gateway" + <Spinner android:id="@+id/ip_settings" style="@style/wifi_item_content" - android:singleLine="true" - android:hint="@string/wifi_gateway_hint" - android:inputType="textNoSuggestions" /> + android:prompt="@string/wifi_ip_settings" + android:entries="@array/wifi_ip_settings" /> + </LinearLayout> - <LinearLayout - style="@style/wifi_item" > - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_network_prefix_length" /> + <LinearLayout android:id="@+id/staticip" + style="@style/wifi_section" + android:visibility="gone"> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_ip_address" /> - <EditText android:id="@+id/network_prefix_length" - style="@style/wifi_item_content" - android:singleLine="true" - android:hint="@string/wifi_network_prefix_length_hint" - android:inputType="number" /> - </LinearLayout> - <LinearLayout - style="@style/wifi_item" > - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_dns1" /> + <EditText android:id="@+id/ipaddress" + style="@style/wifi_item_content" + android:singleLine="true" + android:hint="@string/wifi_ip_address_hint" + android:inputType="textNoSuggestions" /> + </LinearLayout> - <EditText android:id="@+id/dns1" - style="@style/wifi_item_content" - android:singleLine="true" - android:hint="@string/wifi_dns1_hint" - android:inputType="textNoSuggestions" /> - </LinearLayout> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_gateway" /> - <LinearLayout - style="@style/wifi_item" > - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_dns2" /> + <EditText android:id="@+id/gateway" + style="@style/wifi_item_content" + android:singleLine="true" + android:hint="@string/wifi_gateway_hint" + android:inputType="textNoSuggestions" /> + </LinearLayout> - <EditText android:id="@+id/dns2" - style="@style/wifi_item_content" - android:singleLine="true" - android:hint="@string/wifi_dns2_hint" - android:inputType="textNoSuggestions" /> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_network_prefix_length" /> + + <EditText android:id="@+id/network_prefix_length" + style="@style/wifi_item_content" + android:singleLine="true" + android:hint="@string/wifi_network_prefix_length_hint" + android:inputType="number" /> + </LinearLayout> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_dns1" /> + + <EditText android:id="@+id/dns1" + style="@style/wifi_item_content" + android:singleLine="true" + android:hint="@string/wifi_dns1_hint" + android:inputType="textNoSuggestions" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_dns2" /> + + <EditText android:id="@+id/dns2" + style="@style/wifi_item_content" + android:singleLine="true" + android:hint="@string/wifi_dns2_hint" + android:inputType="textNoSuggestions" /> + </LinearLayout> </LinearLayout> </LinearLayout> - </LinearLayout> </ScrollView> |