diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:05 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:05 -0800 |
| commit | 1feaa85791b3b5cc66a16142afc2259a2356bc9e (patch) | |
| tree | 358b291b67f16adb85d6b4a9ce8be57303626a1b /res/layout | |
| parent | 590c0a97ff3b7665306e14da9a999212da5f06b9 (diff) | |
| download | packages_apps_Settings-1feaa85791b3b5cc66a16142afc2259a2356bc9e.tar.gz packages_apps_Settings-1feaa85791b3b5cc66a16142afc2259a2356bc9e.tar.bz2 packages_apps_Settings-1feaa85791b3b5cc66a16142afc2259a2356bc9e.zip | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'res/layout')
40 files changed, 451 insertions, 1482 deletions
diff --git a/res/layout/app_launcher.xml b/res/layout/app_launcher.xml deleted file mode 100644 index 04d3fce7a..000000000 --- a/res/layout/app_launcher.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/app_launcher.xml -** -** Copyright 2007, 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" style="@style/info_layout"> - <LinearLayout style="@style/entry_layout" - android:orientation="vertical"> - - <CheckBox android:id="@+id/newView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/app_launcher_newView_text" /> - - </LinearLayout> -</LinearLayout> diff --git a/res/layout/battery_history.xml b/res/layout/battery_history.xml index c8c2097a2..5421c408a 100644 --- a/res/layout/battery_history.xml +++ b/res/layout/battery_history.xml @@ -1,14 +1,144 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/topLayout" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <ScrollView + + <TextView + android:id="@+id/title" android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" /> + + <LinearLayout + android:id="@+id/graphLayout" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <Spinner + android:id="@+id/typeSpinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:entries="@array/battery_history_type_spinner" /> + + <Spinner + android:id="@+id/whichSpinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:entries="@array/battery_history_which_spinner" /> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <LinearLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + <TextView - android:id="@+id/text" + android:id="@+id/messageText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:textSize="17dp" + android:visibility="gone" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button0" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button1" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button2" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button3" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button4" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button5" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button6" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + <com.android.settings.battery_history.GraphableButton + android:id="@+id/button7" + android:layout_width="fill_parent" + android:layout_height="0dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:layout_weight="1" /> + + </LinearLayout> + </ScrollView> + + </LinearLayout> + + <LinearLayout + android:id="@+id/textLayout" + android:visibility="gone" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" > + + <ScrollView android:layout_width="fill_parent" - android:layout_height="1000dp"/> - </ScrollView> + android:layout_height="fill_parent" > + <TextView + android:id="@+id/detailsText" + android:layout_width="fill_parent" + android:textSize="17dp" + android:layout_height="1000dp"/> + </ScrollView> + + </LinearLayout> + </LinearLayout> diff --git a/res/layout/bluetooth_data_entry.xml b/res/layout/bluetooth_data_entry.xml deleted file mode 100644 index 1900b6e39..000000000 --- a/res/layout/bluetooth_data_entry.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml -** -** Copyright 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:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <TextView android:id="@+id/dataLabel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/bluetooth_new_data" /> - - <EditText android:id="@+id/dataEntry" - android:layout_marginTop="2dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:autoText="false" - android:capitalize="none" - android:singleLine="true" - android:password="true" - android:maxLines="1" /> - <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <Button android:id="@+id/confirmButton" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:text="@string/bluetooth_new_data_confirm" /> - - <Button android:id="@+id/cancelButton" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0.5" - android:text="@string/bluetooth_new_data_cancel" /> - - </LinearLayout> -</LinearLayout> - diff --git a/res/layout/bluetooth_device_list_item.xml b/res/layout/bluetooth_device_list_item.xml deleted file mode 100644 index 3b802612e..000000000 --- a/res/layout/bluetooth_device_list_item.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/any/layout/bluetooth_device_list_item.xml -** -** Copyright 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. -*/ ---> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="3dip" - android:paddingLeft="6dip" - android:paddingRight="6dip"> - - <ImageView android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@android:drawable/sym_contact_card"/> - - <TextView android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="6dip" - android:layout_toRightOf="@id/icon" - android:textColor="#FFFFFFFF" - android:textSize="18sp" - android:textStyle="bold"/> - -</RelativeLayout> diff --git a/res/layout/bluetooth_discoverability_panel.xml b/res/layout/bluetooth_discoverability_panel.xml deleted file mode 100644 index ca50aa8c7..000000000 --- a/res/layout/bluetooth_discoverability_panel.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml -** -** Copyright 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. -*/ ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="2dip" - android:paddingRight="2dip"> - - <LinearLayout - android:text="@string/bluetooth_discoverability_panel_title" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="20dip" - android:paddingRight="20dip"> - - <Button android:id="@+id/discoverable" - android:visibility="visible" - android:text="@string/bluetooth_discoverable" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - - <Button android:id="@+id/connectable" - android:visibility="visible" - android:text="@string/bluetooth_connectable" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - - <Button android:id="@+id/neither" - android:visibility="visible" - android:text="@string/bluetooth_neither" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - - </LinearLayout> -</FrameLayout> diff --git a/res/layout/bluetooth_discovery_screen.xml b/res/layout/bluetooth_discovery_screen.xml deleted file mode 100644 index d3a7f7929..000000000 --- a/res/layout/bluetooth_discovery_screen.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/bluetooth_discovery_screen.xml -** -** Copyright 2007, 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. -*/ ---> - -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingLeft="2dip" - android:paddingRight="2dip"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingLeft="3dip" - android:paddingRight="3dip"> - - <TextView android:id="@+id/label" - android:textStyle="bold" - android:text="@string/bluetooth_scan_for_new_devices" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - - <ListView android:id="@android:id/list" - android:layout_marginTop="5dip" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:drawSelectorOnTop="false"> - </ListView> - </LinearLayout> -</FrameLayout> diff --git a/res/layout/bluetooth_pairing_panel.xml b/res/layout/bluetooth_pairing_panel.xml deleted file mode 100644 index 550bd3809..000000000 --- a/res/layout/bluetooth_pairing_panel.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/layout/bluetooth_pairing_panel.xml -** -** Copyright 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. -*/ ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="2dip" - android:paddingRight="2dip"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="20dip" - android:paddingRight="20dip"> - - <TextView android:id="@+id/status" - android:visibility="visible" - android:text="@string/bluetooth_pairing_msg" - android:layout_width="fill_parent" - android:layout_height="wrap_content"/> - </LinearLayout> -</FrameLayout> diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml index 6739f8468..bcb6f1664 100644 --- a/res/layout/bluetooth_pin_entry.xml +++ b/res/layout/bluetooth_pin_entry.xml @@ -32,6 +32,8 @@ android:id="@+id/message" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" android:gravity="center_horizontal" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/res/layout/bluetooth_sdp_query.xml b/res/layout/bluetooth_sdp_query.xml deleted file mode 100644 index 907de72c1..000000000 --- a/res/layout/bluetooth_sdp_query.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scroll_content" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <LinearLayout - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <TextView android:id="@+id/services" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/bluetooth_sdp_query_services_text" /> - </LinearLayout> -</ScrollView> - diff --git a/res/layout/choose_lock_pattern.xml b/res/layout/choose_lock_pattern.xml index 67a5257c7..110b9ad12 100644 --- a/res/layout/choose_lock_pattern.xml +++ b/res/layout/choose_lock_pattern.xml @@ -24,7 +24,7 @@ <TextView android:id="@+id/headerText" android:layout_width="fill_parent" android:layout_height="0dip" - android:layout_weight="1.0" + android:layout_weight="1" android:gravity="center" android:textSize="18sp"/> @@ -40,39 +40,42 @@ android:layout_width="fill_parent" android:layout_height="8dip" /> - <!-- footer can show a message, or confirm / restart buttons --> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1.0"> + <!-- message just above the button bar --> + <TextView android:id="@+id/footerText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:textSize="14sp"/> - <!-- message --> - <TextView android:id="@+id/footerText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:textSize="14sp"/> + <!-- confirm / restart buttons --> + <LinearLayout style="@android:style/ButtonBar" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> <!-- left button: skip, or retry --> <Button android:id="@+id/footerLeftButton" - android:layout_width="150dip" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" + android:layout_width="0dip" + android:layout_weight="1" android:text="@string/lockpattern_restart_button_text"/> + <!-- Placeholder to get blank space between the two buttons --> + <View + android:visibility="invisible" + android:layout_height="0dip" + android:layout_width="1dip" + android:layout_weight="1" /> + <!-- right button: confirm or ok --> <Button android:id="@+id/footerRightButton" - android:layout_width="150dip" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" + android:layout_width="0dip" + android:layout_weight="1" android:drawableRight="@drawable/ic_btn_next" android:drawablePadding="3dip" android:text="@string/lockpattern_confirm_button_text"/> - </RelativeLayout> + </LinearLayout> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> - diff --git a/res/layout/choose_lock_pattern_example.xml b/res/layout/choose_lock_pattern_example.xml index 0a58f1727..b2d32e679 100644 --- a/res/layout/choose_lock_pattern_example.xml +++ b/res/layout/choose_lock_pattern_example.xml @@ -35,7 +35,6 @@ android:layout_height="wrap_content" android:text="@string/lock_example_title" android:gravity="center_horizontal" - android:layout_marginTop="5dip" style="?android:attr/textAppearanceLarge" /> @@ -61,28 +60,34 @@ </ScrollView> - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="fill_parent"> + <LinearLayout style="@android:style/ButtonBar" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> <Button android:id="@+id/skip_button" - android:layout_width="150dip" android:layout_height="wrap_content" - android:layout_margin="5dip" - android:layout_alignParentLeft="true" + android:layout_width="0dip" + android:layout_weight="1" android:text="@string/skip_button_label" /> + <View + android:visibility="invisible" + android:layout_height="0dip" + android:layout_width="0dip" + android:layout_weight="1" + /> + <Button android:id="@+id/next_button" - android:layout_width="150dip" android:layout_height="wrap_content" - android:layout_margin="5dip" + android:layout_width="0dip" + android:layout_weight="1" android:drawableRight="@drawable/ic_btn_next" android:drawablePadding="3dip" - android:layout_alignParentRight="true" android:text="@string/next_button_label" /> - </RelativeLayout> + </LinearLayout> -</LinearLayout > +</LinearLayout> diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml index 1c3e90bf0..47af50b36 100644 --- a/res/layout/choose_lock_pattern_tutorial.xml +++ b/res/layout/choose_lock_pattern_tutorial.xml @@ -52,30 +52,34 @@ </ScrollView> - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="fill_parent"> - + <LinearLayout style="@android:style/ButtonBar" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + <Button android:id="@+id/skip_button" - android:layout_width="150dip" android:layout_height="wrap_content" + android:layout_width="0dip" android:layout_weight="1" - android:layout_margin="5dip" - android:layout_alignParentLeft="true" android:text="@string/skip_button_label" /> + <View + android:visibility="invisible" + android:layout_height="0dip" + android:layout_width="0dip" + android:layout_weight="1" + /> + <Button android:id="@+id/next_button" - android:layout_width="150dip" android:layout_height="wrap_content" + android:layout_width="0dip" android:layout_weight="1" - android:layout_margin="5dip" - android:layout_alignParentRight="true" android:drawableRight="@drawable/ic_btn_next" android:drawablePadding="3dip" android:text="@string/next_button_label" /> - </RelativeLayout> + </LinearLayout> </LinearLayout > diff --git a/res/layout/date_picker_activity.xml b/res/layout/date_picker_activity.xml deleted file mode 100644 index 16a4a69b2..000000000 --- a/res/layout/date_picker_activity.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2007, 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 - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <DatePicker - android:id="@+id/datePicker" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" /> - -</RelativeLayout> diff --git a/res/layout/date_time.xml b/res/layout/date_time.xml deleted file mode 100644 index fc7e94257..000000000 --- a/res/layout/date_time.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/any/layout/date_time.xml -** -** Copyright 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" - style="@style/info_layout"> - - <!-- time picker --> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/timeDisplay" - android:maxLines="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/date_time_timeDisplay_text"/> - <Button android:id="@+id/changeTime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/date_time_changeTime_text"/> - </LinearLayout> - - - <!-- date picker --> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/dateDisplay" - android:maxLines="1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/date_time_dateDisplay_text"/> - <Button android:id="@+id/changeDate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/date_time_changeDate_text"/> - </LinearLayout> - - <!-- Time Zone --> - <LinearLayout style="@style/entry_layout"> - <TextView android:text="@string/date_time_timezone_label" style="@style/info_label" /> - <TextView android:id="@+id/zone" style="@style/info_value" /> - </LinearLayout> - - <Button android:id="@+id/setzone" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/date_time_setzone_text" /> -</LinearLayout> - diff --git a/res/layout/device_info_screen.xml b/res/layout/device_info_screen.xml deleted file mode 100644 index 7f4af3195..000000000 --- a/res/layout/device_info_screen.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/device_info_screen.xml -** -** Copyright 2007, 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. -*/ ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:paddingBottom="3dip" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <requestFocus/> - - <LinearLayout android:id="@+id/list" - android:orientation="vertical" - android:paddingLeft="10dip" - android:paddingTop="10dip" - android:paddingRight="10dip" - android:paddingBottom="10dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <!-- Note: Property values are inserted above these controls. --> - - <TextView android:id="@+id/target_build_label" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textStyle="bold" - android:text="@string/target_build_field_label" /> - - <EditText android:id="@+id/target_build_field" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="3dip" - android:paddingBottom="6dip" /> - - <Button android:id="@+id/checkin_button" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/checkin_button_label" /> - - </LinearLayout> -</ScrollView> diff --git a/res/layout/info_screen.xml b/res/layout/info_screen.xml deleted file mode 100644 index adb9ca5e7..000000000 --- a/res/layout/info_screen.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/device_info_screen.xml -** -** Copyright 2007, 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. -*/ ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <requestFocus/> - - <LinearLayout android:id="@+id/list" - android:orientation="vertical" - android:paddingLeft="10dip" - android:paddingTop="5dip" - android:paddingRight="10dip" - android:paddingBottom="5dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - </LinearLayout> -</ScrollView> - diff --git a/res/layout/info_screen_item.xml b/res/layout/info_screen_item.xml deleted file mode 100644 index 1f7101635..000000000 --- a/res/layout/info_screen_item.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- List item layout for a setting --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingBottom="10dip" - android:orientation="vertical"> - - <TextView - android:id="@+id/info_name_text" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textStyle="bold" /> - - <TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/info_value_text" - android:paddingLeft="20dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textColor="@color/lighter_gray" /> - -</LinearLayout> diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml index 6ca92d299..4c06f9941 100644 --- a/res/layout/installed_app_details.xml +++ b/res/layout/installed_app_details.xml @@ -24,41 +24,13 @@ android:id="@+id/all_details" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:paddingRight="6dip" + android:paddingTop="5dip" + android:paddingBottom="5dip" android:orientation="vertical"> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical"> - <TextView android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorPrimary" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:paddingTop="6dip" - android:paddingRight="6dip" - android:paddingLeft="6dip" /> - - <TextView android:id="@+id/app_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_below="@id/app_name" - android:layout_alignParentLeft="true" - android:paddingTop="6dip" - android:paddingBottom="6dip" - android:paddingRight="6dip" - android:paddingLeft="6dip" /> - <ImageView android:id="@+id/app_icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_alignParentRight="true" - android:paddingTop="6dip" - android:paddingBottom="6dip" - android:paddingRight="6dip" - android:scaleType="fitCenter" /> - </RelativeLayout> + <include + layout="@layout/manage_applications_item" + android:id="@+id/app_snippet"/> <TextView style="?android:attr/listSeparatorTextViewStyle" @@ -316,6 +288,24 @@ android:layout_height="fill_parent" android:orientation="vertical"/> </LinearLayout> + + <!-- Prefered activities section --> + <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:text="@string/controls_label" /> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"> + <Button android:id="@+id/force_stop_button" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_width="150dip" + android:text="@string/force_stop" + android:layout_height="wrap_content" /> + </RelativeLayout> </LinearLayout> </ScrollView> diff --git a/res/layout/keyguard.xml b/res/layout/keyguard.xml deleted file mode 100644 index 64a48deee..000000000 --- a/res/layout/keyguard.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/keyguard.xml -** -** Copyright 2007, 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" style="@style/info_layout"> - <!-- Keyboard Version --> - <LinearLayout style="@style/entry_layout" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/keyguard_label" /> - - <Spinner android:id="@+id/kg_options" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dip"> - </Spinner> - - <Button android:id="@+id/pw_mod" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:text="@string/keyguard_pw_mod_text" - android:gravity="center_horizontal" /> - - </LinearLayout> - - <LinearLayout style="@style/entry_layout" - android:orientation="vertical" - android:layout_marginTop="20dip" - > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/keyguard_sim_pin_label" /> - - <Button android:id="@+id/pin_enable" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:gravity="center_horizontal" /> - - <Button android:id="@+id/pin_mod" - android:layout_width="150dip" - android:layout_height="wrap_content" - android:text="@string/keyguard_pin_mod_text" - android:gravity="center_horizontal" /> - - </LinearLayout> -</LinearLayout> diff --git a/res/layout/keyguard_password.xml b/res/layout/keyguard_password.xml deleted file mode 100644 index 7bf3b1552..000000000 --- a/res/layout/keyguard_password.xml +++ /dev/null @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/keyguard_password.xml -** -** Copyright 2007, 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. -*/ ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - > - - <LinearLayout - style="@style/info_layout" - android:orientation="vertical"> - - <TextView - style="@style/info_label" - android:text="@string/keyguard_password_old_label" - /> - - <EditText android:id="@+id/old_password" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:autoText="false" - android:capitalize="none" - android:password="true" - android:maxLength="32" - /> - - <TextView android:id="@+id/old_password_error" - style="@style/info_label" - android:visibility="gone" - android:text="@string/keyguard_password_old_password_error_text" - /> - - - <TextView - style="@style/info_label" - android:text="@string/keyguard_password_new_label" - /> - - <EditText android:id="@+id/new_password_1" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:autoText="false" - android:capitalize="none" - android:password="true" - android:maxLength="32" - /> - - - <TextView - style="@style/info_label" - android:text="@string/keyguard_password_confirm_new_label" - /> - - <EditText android:id="@+id/new_password_2" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="true" - android:autoText="false" - android:capitalize="none" - android:password="true" - android:maxLength="32" - /> - - - <TextView android:id="@+id/mismatch_error" - style="@style/info_label" - android:visibility="gone" - android:text="@string/keyguard_password_mismatch_error_text" - /> - - - <Button android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/keyguard_password_button_text" - /> - </LinearLayout> - -</ScrollView> - diff --git a/res/layout/list_setting_value_spinner.xml b/res/layout/list_setting_value_spinner.xml deleted file mode 100644 index b603cf4f7..000000000 --- a/res/layout/list_setting_value_spinner.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- Template for the generic static text in a setting's value --> -<Spinner - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/setting_value_spinner" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml index 78addc92c..ecefcf58b 100755 --- a/res/layout/manage_applications_item.xml +++ b/res/layout/manage_applications_item.xml @@ -17,39 +17,43 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:minHeight="?android:attr/listPreferredItemHeight"> + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:paddingRight="6dip" + android:paddingLeft="6dip" + android:paddingTop="5dip" + android:paddingBottom="5dip" + android:gravity="center_vertical" > <ImageView android:id="@+id/app_icon" android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" - android:layout_alignParentLeft="true" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:background="@drawable/border_item_thumbnail" /> + android:layout_marginLeft="5dip" + android:layout_marginRight="11dip" + android:layout_gravity="center_vertical" + android:scaleType="fitCenter"/> - <TextView android:id="@+id/app_size" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_alignParentRight="true" - android:paddingRight="6dip" - android:paddingLeft="12dip" - android:paddingTop="16dip" - android:maxLines="1" /> - - <TextView android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="?android:attr/textColorPrimary" - android:layout_toRightOf="@id/app_icon" - android:layout_toLeftOf="@id/app_size" - android:layout_alignTop="@id/app_icon" - android:paddingLeft="2dip" - android:paddingTop="6dip"/> -</RelativeLayout> + <LinearLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + <TextView android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textStyle="bold" + android:singleLine="true" + android:ellipsize="marquee" + android:layout_marginBottom="2dip" /> + <TextView android:id="@+id/app_size" + android:layout_marginTop="-4dip" + android:layout_gravity="center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> +</LinearLayout> diff --git a/res/layout/media_format_final.xml b/res/layout/media_format_final.xml new file mode 100644 index 000000000..ab18f3414 --- /dev/null +++ b/res/layout/media_format_final.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright (C) 2008 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" + style="@style/info_layout"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20sp" + android:text="@string/media_format_final_desc" /> + + <Button android:id="@+id/execute_media_format" + android:layout_gravity="center_horizontal" + android:layout_marginTop="40dip" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:text="@string/media_format_final_button_text" + android:gravity="center" /> + +</LinearLayout> diff --git a/res/layout/media_format_primary.xml b/res/layout/media_format_primary.xml new file mode 100644 index 000000000..359049221 --- /dev/null +++ b/res/layout/media_format_primary.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright (C) 2008 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" + style="@style/info_layout"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="18sp" + android:text="@string/media_format_desc" /> + + <Button android:id="@+id/initiate_media_format" + android:layout_gravity="center_horizontal" + android:layout_marginTop="40dip" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:text="@string/media_format_button_text" + android:gravity="center" /> + +</LinearLayout> diff --git a/res/layout/mylocation.xml b/res/layout/mylocation.xml deleted file mode 100644 index 97a7b0eab..000000000 --- a/res/layout/mylocation.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/keyguard.xml -** -** Copyright 2007, 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" style="@style/info_layout"> - <LinearLayout style="@style/entry_layout" - android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/location_label" /> - - <Spinner android:id="@+id/provider_spinner" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dip"> - </Spinner> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/location_status" /> - - <Spinner android:id="@+id/enabled_spinner" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dip"> - </Spinner> - </LinearLayout> -</LinearLayout> diff --git a/res/layout/power_management.xml b/res/layout/power_management.xml deleted file mode 100644 index e45040482..000000000 --- a/res/layout/power_management.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2007, 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" style="@style/info_layout"> - <!-- Keyboard Version --> - <LinearLayout style="@style/entry_layout" android:orientation="vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/screen_off_timeout_label"> - </TextView> - - <Spinner android:id="@+id/screen_off_timeout" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="5dip"> - </Spinner> - - <!-- Stay on while plugged in --> - <CheckBox android:id="@+id/dim_screen" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/dim_screen"> - </CheckBox> - - <!-- Stay on while plugged in --> - <CheckBox android:id="@+id/stay_on" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/stay_on"> - </CheckBox> - - </LinearLayout> -</LinearLayout> diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml index f2f2c9d1c..6528e54d6 100644 --- a/res/layout/preference_progress_category.xml +++ b/res/layout/preference_progress_category.xml @@ -16,13 +16,18 @@ <!-- Layout used for ProgressCategory in bluetooth settings. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="27dip" - android:background="@*android:drawable/settings_header"> + style="?android:attr/listSeparatorTextViewStyle"> + <!-- This and the other text view have the style of the list separator text view without the background and padding --> <TextView - android:id="@+android:id/title" style="?android:attr/listSeparatorTextViewStyle" + android:background="@null" + android:paddingLeft="0dip" + android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" /> <ProgressBar @@ -37,13 +42,14 @@ /> <TextView + style="?android:attr/listSeparatorTextViewStyle" + android:background="@null" + android:paddingLeft="0dip" android:id="@+id/scanning_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toLeftOf="@id/scanning_progress" - android:textSize="18sp" - android:textColor="@android:color/primary_text_light" android:layout_marginRight="5sp" android:text="@string/progress_scanning" /> diff --git a/res/layout/preference_widget_btdevice_status.xml b/res/layout/preference_widget_btdevice_status.xml deleted file mode 100644 index 9882ed920..000000000 --- a/res/layout/preference_widget_btdevice_status.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<ImageView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/device_headset" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="4sp" - android:layout_gravity="center_vertical" - android:visibility="gone" - android:src="@android:drawable/stat_sys_headset" /> diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml index 1b20373ea..e8eba5a0d 100644 --- a/res/layout/radio_info.xml +++ b/res/layout/radio_info.xml @@ -255,5 +255,17 @@ android:layout_toRightOf="@id/smsc_label" /> </RelativeLayout> + <!-- Test setting to ignore bad DNS, useful in lab environments --> + <LinearLayout style="@style/entry_layout"> + <Button android:id="@+id/dns_check_toggle" + android:textSize="14sp" + android:layout_marginTop="8dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/radio_info_toggle_dns_check_label" + /> + <TextView android:id="@+id/dnsCheckState" style="@style/info_value" /> + </LinearLayout> + </LinearLayout> </ScrollView> diff --git a/res/layout/ringer_volume_screen.xml b/res/layout/ringer_volume_screen.xml deleted file mode 100644 index aa06fa43f..000000000 --- a/res/layout/ringer_volume_screen.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/res/layout/ringer_volume_screen.xml -** -** Copyright 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. -*/ ---> - -<ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollbars="none"> - - <LinearLayout - android:id="@+id/list" - android:orientation="vertical" - android:paddingLeft="10dip" - android:paddingTop="10dip" - android:paddingRight="10dip" - android:paddingBottom="10dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ringer_volume_instructions" /> - - <LinearLayout - style="@style/entry_layout" - android:orientation="vertical" - android:layout_marginTop="20dip"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ringer_volume_ringer_mode_label" /> - - <Spinner - android:id="@+id/ringer_mode" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - <requestFocus /> - </Spinner> - - </LinearLayout> - - <LinearLayout - style="@style/entry_layout" - android:orientation="vertical" - android:layout_marginTop="20dip"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ringer_volume_ringtone_label" /> - - <Spinner - android:id="@+id/file" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - </Spinner> - - </LinearLayout> - - <LinearLayout - style="@style/entry_layout" - android:orientation="vertical" - android:layout_marginTop="20dip"> - - <CheckBox - android:id="@+id/increasing" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ringer_volume_screen_increasing_text" /> - - - - </LinearLayout> - - </LinearLayout> - -</ScrollView> diff --git a/res/layout/sdcard_settings_screen.xml b/res/layout/sdcard_settings_screen.xml index 52ef2fc31..734a5b6fc 100644 --- a/res/layout/sdcard_settings_screen.xml +++ b/res/layout/sdcard_settings_screen.xml @@ -64,6 +64,12 @@ android:textSize="14sp" android:layout_marginTop="8dip" android:layout_width="wrap_content" android:layout_height="wrap_content" /> + + <Button android:id="@+id/sdcard_format" + android:text="@string/sdcard_format" + android:textSize="14sp" + android:layout_marginTop="8dip" + android:layout_width="wrap_content" android:layout_height="wrap_content" /> <TableLayout android:layout_width="fill_parent" diff --git a/res/layout/settings_chooser.xml b/res/layout/settings_chooser.xml deleted file mode 100644 index ad79485e1..000000000 --- a/res/layout/settings_chooser.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- TODO: Remove file 881807 --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:text="@string/settings_chooser_pick_string" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textStyle="bold" /> - - <Spinner - android:id="@+id/settings_app_spinner" - android:layout_marginLeft="20dip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> - -</LinearLayout> diff --git a/res/layout/systemsettings.xml b/res/layout/systemsettings.xml deleted file mode 100644 index 54bf89691..000000000 --- a/res/layout/systemsettings.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- Layout for system settings that require an expandable list --> -<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/system_settings" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> -</ExpandableListView> diff --git a/res/layout/systemsettings_flat.xml b/res/layout/systemsettings_flat.xml deleted file mode 100644 index 0d0126bae..000000000 --- a/res/layout/systemsettings_flat.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<!-- Layout for system settings that require a flat list --> -<ListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/system_settings" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> -</ListView> diff --git a/res/layout/telephony_editor.xml b/res/layout/telephony_editor.xml deleted file mode 100644 index 172147889..000000000 --- a/res/layout/telephony_editor.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/any/layout/radio_info.xml -** -** Copyright 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. -*/ ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout style="@style/form_layout"> - <TextView android:text="@string/telephony_name_label" style="@style/form_label" /> - <EditText android:id="@+id/name" style="@style/form_value" /> - - <TextView android:text="@string/telephony_apn_label" style="@style/form_label" /> - <EditText android:id="@+id/apn" style="@style/form_value" /> - - <TextView android:text="@string/telephony_proxy_label" style="@style/form_label" /> - <EditText android:id="@+id/proxy" style="@style/form_value" /> - - <TextView android:text="@string/telephony_port_label" style="@style/form_label" /> - <EditText android:id="@+id/port" style="@style/form_value" /> - - <TextView android:text="@string/telephony_user_label" style="@style/form_label" /> - <EditText android:id="@+id/user" style="@style/form_value" /> - - <TextView android:text="@string/telephony_server_label" style="@style/form_label" /> - <EditText android:id="@+id/server" style="@style/form_value" /> - - <TextView android:text="@string/telephony_password_label" style="@style/form_label" /> - <EditText android:id="@+id/password" style="@style/form_value" /> - - <TextView android:text="@string/telephony_mmsproxy_label" style="@style/form_label" /> - <EditText android:id="@+id/mmsproxy" style="@style/form_value" /> - - <TextView android:text="@string/telephony_mmsport_label" style="@style/form_label" /> - <EditText android:id="@+id/mmsport" style="@style/form_value" /> - - <TextView android:text="@string/telephony_mmsc_label" style="@style/form_label" /> - <EditText android:id="@+id/mmsc" style="@style/form_value" /> - - <TextView android:text="@string/telephony_mcc_label" style="@style/form_label" /> - <EditText android:id="@+id/mcc" style="@style/form_value" /> - - <TextView android:text="@string/telephony_mnc_label" style="@style/form_label" /> - <EditText android:id="@+id/mnc" style="@style/form_value" /> - </LinearLayout> -</ScrollView> - - diff --git a/res/layout/time_picker_activity.xml b/res/layout/time_picker_activity.xml deleted file mode 100644 index 6e758a15f..000000000 --- a/res/layout/time_picker_activity.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2007, 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 xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <TimePicker android:id="@+id/timePicker" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" /> -</RelativeLayout> diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml new file mode 100755 index 000000000..727052d6a --- /dev/null +++ b/res/layout/usage_stats.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <TextView + android:text="@string/display_order_text" + android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + <Spinner + android:id="@+id/typeSpinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:entries="@array/usage_stats_display_order_types" /> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + <TextView + android:text="@string/app_name_label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:paddingRight="6dip" + android:layout_height="wrap_content" /> + <TextView + android:text="@string/launch_count_label" + android:paddingRight="6dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <TextView + android:text="@string/usage_time_label" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </LinearLayout> + <ListView android:id="@+id/pkg_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:drawSelectorOnTop="false" /> +</LinearLayout> diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml new file mode 100755 index 000000000..7ab00904f --- /dev/null +++ b/res/layout/usage_stats_item.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2008, 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="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:minHeight="?android:attr/listPreferredItemHeight"> + + <TextView android:id="@+id/package_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingRight="6dip" + android:paddingLeft="12dip" + android:maxLines="1" /> + + <TextView android:id="@+id/launch_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingRight="6dip" + android:paddingLeft="12dip" + android:maxLines="1" /> + + <TextView android:id="@+id/usage_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingRight="6dip" + android:paddingLeft="12dip" + android:maxLines="1" /> +</LinearLayout> + diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml deleted file mode 100644 index f95043f9a..000000000 --- a/res/layout/wallpaper_picker.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<GridView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/grid" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="10dip" - android:verticalSpacing="10dp" - android:horizontalSpacing="10dp" - android:numColumns="auto_fit" - android:columnWidth="60dp" - android:stretchMode="columnWidth" - android:gravity="top|center_horizontal" - android:fadingEdge="none"/> diff --git a/res/layout/wifi_screen.xml b/res/layout/wifi_screen.xml deleted file mode 100644 index a247f85cf..000000000 --- a/res/layout/wifi_screen.xml +++ /dev/null @@ -1,228 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/Settings/assets/res/any/layout/wifi_screen.xml -** -** Copyright 2007, 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. -*/ ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingLeft="2dip" - android:paddingRight="2dip"> - - <LinearLayout - android:orientation="vertical" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:paddingBottom="3dip" - android:layout_width="fill_parent" android:layout_height="wrap_content"> - - <TextView android:id="@+id/status" - android:textSize="13sp" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_screen_status_text" /> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <CheckBox android:id="@+id/dhcp" - android:textSize="13sp" - android:layout_width="100dip" - android:layout_height="wrap_content" - android:text="@string/wifi_screen_dhcp_text" /> - - <CheckBox android:id="@+id/manual" - android:textSize="13sp" - android:layout_width="100dip" - android:layout_height="wrap_content" - android:text="@string/wifi_screen_manual_text" /> - - </LinearLayout> - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <TextView - android:textSize="13sp" - android:textStyle="bold" - android:paddingTop="6dip" - android:maxLines="1" - android:layout_width="60dip" android:layout_height="wrap_content" - android:text="@string/wifi_wlan_id" /> - - <Spinner android:id="@+id/essid" - android:textSize="13sp" - android:maxLines="1" - android:layout_marginLeft="3dip" - android:layout_width="150dip" - android:layout_height="wrap_content"> - <requestFocus/> - </Spinner> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <Button android:id="@+id/activate" - android:textSize="13sp" - android:layout_marginTop="2dip" - android:layout_width="100dip" android:layout_height="wrap_content" - android:text="@string/wifi_screen_activate_text" /> - - <Button android:id="@+id/test" - android:textSize="13sp" - android:layout_marginTop="2dip" - android:layout_width="100dip" android:layout_height="wrap_content" - android:text="@string/wifi_screen_test_text" /> - - </LinearLayout> - - <LinearLayout android:id="@+id/manualconfig" - android:orientation="vertical" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingBottom="3dip" - android:layout_width="fill_parent" android:layout_height="wrap_content"> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <TextView - android:textSize="13sp" - android:textStyle="bold" - android:paddingTop="6dip" - android:maxLines="1" - android:layout_width="60dip" android:layout_height="wrap_content" - android:text="@string/wifi_host_ip" /> - - <EditText android:id="@+id/ip" - android:textSize="13sp" - android:maxLines="1" - android:layout_marginLeft="3dip" - android:autoText="false" - android:capitalize="none" - android:layout_width="150dip" android:layout_height="wrap_content" - android:text="@string/wifi_screen_ip_text" /> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <TextView - android:textSize="13sp" - android:textStyle="bold" - android:paddingTop="6dip" - android:maxLines="1" - android:layout_width="60dip" android:layout_height="wrap_content" - android:text="@string/wifi_netmask_label" /> - - <EditText android:id="@+id/netmask" - android:textSize="13sp" - android:maxLines="1" - android:layout_marginLeft="3dip" - android:layout_width="150dip" android:layout_height="wrap_content" - android:autoText="false" - android:capitalize="none" - android:text="@string/wifi_screen_netmask_text" /> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <TextView - android:textSize="13sp" - android:textStyle="bold" - android:paddingTop="6dip" - android:maxLines="1" - android:layout_width="60dip" android:layout_height="wrap_content" - android:text="@string/wifi_gateway_label" /> - - <EditText android:id="@+id/gateway" - android:textSize="13sp" - android:maxLines="1" - android:layout_marginLeft="3dip" - android:layout_width="150dip" android:layout_height="wrap_content" - android:autoText="false" - android:capitalize="none" - android:text="@string/wifi_screen_gateway_text" /> - - </LinearLayout> - - <LinearLayout - android:orientation="horizontal" - android:paddingLeft="3dip" - android:paddingRight="3dip" - android:paddingTop="0dip" - android:paddingBottom="0dip" - android:layout_height="wrap_content" android:layout_width="fill_parent"> - - <TextView - android:textSize="13sp" - android:textStyle="bold" - android:paddingTop="6dip" - android:maxLines="1" - android:layout_width="60dip" android:layout_height="wrap_content" - android:text="@string/wifi_dns_label" /> - - <EditText android:id="@+id/dns" - android:textSize="13sp" - android:maxLines="1" - android:layout_marginLeft="3dip" - android:layout_width="150dip" android:layout_height="wrap_content" - android:autoText="false" - android:capitalize="none" - android:text="@string/wifi_screen_dns_text" /> - - </LinearLayout> - - </LinearLayout> - - - </LinearLayout> -</FrameLayout> |