diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bluetooth_pb_access.xml | 4 | ||||
| -rw-r--r-- | res/layout/data_usage_chart.xml | 4 | ||||
| -rw-r--r-- | res/layout/data_usage_header.xml | 4 | ||||
| -rw-r--r-- | res/layout/data_usage_summary.xml | 18 | ||||
| -rwxr-xr-x | res/layout/manage_applications.xml | 3 | ||||
| -rw-r--r-- | res/layout/manage_apps_tab_content.xml | 18 | ||||
| -rw-r--r-- | res/layout/tab_widget.xml | 30 | ||||
| -rwxr-xr-x | res/layout/two_buttons_panel.xml | 10 | ||||
| -rw-r--r-- | res/layout/wifi_dialog.xml | 291 |
9 files changed, 203 insertions, 179 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/data_usage_chart.xml b/res/layout/data_usage_chart.xml index 4dae248..7f63f3f 100644 --- a/res/layout/data_usage_chart.xml +++ b/res/layout/data_usage_chart.xml @@ -20,8 +20,8 @@ android:id="@+id/chart" android:layout_width="match_parent" android:layout_height="@dimen/data_usage_chart_height" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="16dip" + android:paddingRight="16dip" android:paddingTop="16dip" android:paddingBottom="16dip" settings:optimalWidth="@dimen/data_usage_chart_optimalWidth" diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index ba41c88..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" diff --git a/res/layout/data_usage_summary.xml b/res/layout/data_usage_summary.xml index d59e0d6..b754d0c 100644 --- a/res/layout/data_usage_summary.xml +++ b/res/layout/data_usage_summary.xml @@ -25,20 +25,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <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:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="?android:attr/tabWidgetStyle" /> - - </HorizontalScrollView> + <include layout="@layout/tab_widget" /> <!-- give an empty content area to make tabhost happy --> <FrameLayout @@ -51,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 b8cee87..3898227 100644 --- a/res/layout/manage_apps_tab_content.xml +++ b/res/layout/manage_apps_tab_content.xml @@ -28,21 +28,8 @@ 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:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - style="?android:attr/tabWidgetStyle" /> - - </HorizontalScrollView> + + <include layout="@layout/tab_widget" /> <FrameLayout android:id="@android:id/tabcontent" @@ -52,4 +39,3 @@ </LinearLayout> </TabHost> - diff --git a/res/layout/tab_widget.xml b/res/layout/tab_widget.xml new file mode 100644 index 0000000..a6adc5d --- /dev/null +++ b/res/layout/tab_widget.xml @@ -0,0 +1,30 @@ +<?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. +--> + +<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"> + + <TabWidget + android:id="@android:id/tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + style="?android:attr/tabWidgetStyle" /> + +</HorizontalScrollView> diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml index e90c4a0..5d76312 100755 --- a/res/layout/two_buttons_panel.xml +++ b/res/layout/two_buttons_panel.xml @@ -29,9 +29,10 @@ android:orientation="horizontal"> <Button android:id="@+id/left_button" - android:layout_width="150dip" + 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" @@ -41,8 +42,9 @@ android:layout_weight="0.2" /> <Button android:id="@+id/right_button" - android:layout_width="150dip" + 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/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> |