diff options
Diffstat (limited to 'res/layout')
58 files changed, 853 insertions, 848 deletions
diff --git a/res/layout/accessibility_tutorial_1.xml b/res/layout/accessibility_tutorial_1.xml deleted file mode 100644 index b2bb40d..0000000 --- a/res/layout/accessibility_tutorial_1.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<GridView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/all_apps" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:columnWidth="96dip" - android:numColumns="auto_fit" - android:verticalSpacing="10dip" - android:horizontalSpacing="20dip" - android:stretchMode="columnWidth" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_2.xml b/res/layout/accessibility_tutorial_2.xml deleted file mode 100644 index 5f9c69d..0000000 --- a/res/layout/accessibility_tutorial_2.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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. ---> - -<ListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/list_view" - android:layout_width="fill_parent" - android:layout_height="fill_parent" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_app_icon.xml b/res/layout/accessibility_tutorial_app_icon.xml deleted file mode 100644 index fe8399e..0000000 --- a/res/layout/accessibility_tutorial_app_icon.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/app_icon" - style="@style/AccessibilityTutorialIcon" />
\ No newline at end of file diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml deleted file mode 100644 index 6566cff..0000000 --- a/res/layout/accessibility_tutorial_container.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_height="fill_parent" - android:layout_width="fill_parent"> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_height="0dip" - android:layout_width="fill_parent" - android:layout_weight="1.0" - android:paddingLeft="15dip" - android:paddingRight="15dip"> - - </LinearLayout> - - <LinearLayout - android:orientation="vertical" - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:paddingLeft="15dip" - android:paddingRight="15dip"> - - <View - android:layout_width="wrap_content" - android:layout_height="1dip" - android:layout_gravity="center" - android:background="@android:drawable/divider_horizontal_dark" - android:layout_marginBottom="8dip" - android:focusable="false" - android:clickable="false" /> - - <view - class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView" - android:id="@+id/instructions" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dip" - android:textAppearance="@style/AccessibilityTutorialBodyTextPrimary" /> - - </LinearLayout> - - <RelativeLayout - android:layout_height="wrap_content" - android:layout_width="fill_parent" - android:background="@android:drawable/bottom_bar"> - - <Button - android:id="@+id/skip_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentLeft="true" - android:text="@string/accessibility_tutorial_skip" - android:visibility="gone" /> - - <Button - android:id="@+id/back_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentLeft="true" - android:text="@string/accessibility_tutorial_back" - android:visibility="gone" /> - - <Button - android:id="@+id/next_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentRight="true" - android:text="@string/accessibility_tutorial_next" - android:visibility="gone" /> - - <Button - android:id="@+id/finish_button" - style="@style/AccessibilityTutorialButton" - android:layout_alignParentRight="true" - android:text="@string/accessibility_tutorial_finish" - android:visibility="gone" /> - - </RelativeLayout> -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/account_preference.xml b/res/layout/account_preference.xml index 5e2edc6..bc3f8f9 100644 --- a/res/layout/account_preference.xml +++ b/res/layout/account_preference.xml @@ -18,4 +18,5 @@ android:id="@+id/syncStatusIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:contentDescription="@null" /> diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml index d54d750..117b58a 100644 --- a/res/layout/account_sync_screen.xml +++ b/res/layout/account_sync_screen.xml @@ -26,6 +26,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + <ImageView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scaleType="fitXY" + android:src="?android:attr/listDivider" /> + <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="0dip" diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml index e91ec50..8ce90d7 100644 --- a/res/layout/android_beam.xml +++ b/res/layout/android_beam.xml @@ -41,6 +41,7 @@ <ImageView android:id="@+id/android_beam_image" android:layout_width="match_parent" android:layout_height="wrap_content" + android:contentDescription="@null" /> </LinearLayout> diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml index e5710e4..eee6165 100644 --- a/res/layout/app_percentage_item.xml +++ b/res/layout/app_percentage_item.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingTop="8dip" android:paddingBottom="8dip" android:columnCount="3"> @@ -30,7 +30,8 @@ android:layout_height="48dip" android:layout_rowSpan="3" android:layout_marginRight="8dip" - android:scaleType="centerInside" /> + android:scaleType="centerInside" + android:contentDescription="@null" /> <TextView android:id="@android:id/title" diff --git a/res/layout/apps_spinner_dropdown_item.xml b/res/layout/apps_spinner_dropdown_item.xml new file mode 100644 index 0000000..6f641e7 --- /dev/null +++ b/res/layout/apps_spinner_dropdown_item.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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. +*/ +--> +<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + style="?android:attr/spinnerDropDownItemStyle" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeightSmall" + android:ellipsize="marquee" /> diff --git a/res/layout/apps_spinner_item.xml b/res/layout/apps_spinner_item.xml new file mode 100644 index 0000000..1ca6ffc --- /dev/null +++ b/res/layout/apps_spinner_item.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + style="?android:attr/spinnerItemStyle" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="marquee" /> diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml index a0d71c6..b4ffe73 100644 --- a/res/layout/bookmark_picker_item.xml +++ b/res/layout/bookmark_picker_item.xml @@ -26,7 +26,8 @@ <ImageView android:id="@+id/icon" android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" - android:scaleType="fitCenter" /> + android:scaleType="fitCenter" + android:contentDescription="@null" /> <TextView android:id="@+id/title" android:layout_width="match_parent" diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index cb817c5..e979413 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -45,6 +45,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -53,7 +54,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml index 21eecc2..c952139 100644 --- a/res/layout/confirm_lock_password.xml +++ b/res/layout/confirm_lock_password.xml @@ -49,6 +49,7 @@ android:singleLine="true" android:textStyle="bold" android:inputType="textPassword" + android:imeOptions="actionNext" android:gravity="center" android:layout_gravity="center" android:textSize="24sp" @@ -57,7 +58,6 @@ android:textAppearance="?android:attr/textAppearanceLarge" android:background="@drawable/password_field_default" android:textColor="#ffffffff" - android:imeOptions="actionNext|flagNoEnterAction" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout/crypt_keeper_blank.xml b/res/layout/crypt_keeper_blank.xml index 1c880c2..2cd9c91 100644 --- a/res/layout/crypt_keeper_blank.xml +++ b/res/layout/crypt_keeper_blank.xml @@ -27,6 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:src="@drawable/encroid_progress" + android:contentDescription="@null" /> </LinearLayout> diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml index 17968e8..97afe6a 100644 --- a/res/layout/crypt_keeper_password_field.xml +++ b/res/layout/crypt_keeper_password_field.xml @@ -26,8 +26,7 @@ android:layout_weight="1" android:singleLine="true" android:inputType="textPassword" - android:imeOptions="actionDone" - android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii" + android:imeOptions="flagForceAscii|actionDone" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -36,6 +35,7 @@ android:layout_height="wrap_content" android:src="@drawable/ic_lockscreen_ime" android:clickable="true" + android:contentDescription="@string/crypt_keeper_switch_input_method" android:padding="8dip" android:layout_gravity="center" android:background="?android:attr/selectableItemBackground" diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml index 35760cf..0d408c2 100644 --- a/res/layout/crypt_keeper_progress.xml +++ b/res/layout/crypt_keeper_progress.xml @@ -64,6 +64,7 @@ android:layout_weight="1" android:layout_gravity="bottom|right" android:src="@drawable/encroid_waiting" + android:contentDescription="@null" /> <Button diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index 5144e75..80da437 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -23,14 +23,15 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" > <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:layout_marginTop="8dip" + android:layout_gravity="center" android:layout_marginBottom="8dip" > @@ -63,16 +64,6 @@ </com.android.internal.widget.DigitalClock> <TextView - android:id="@+id/date" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/time" - android:layout_marginTop="10dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="22sp" - /> - - <TextView android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml index 136fec6..c9647c8 100644 --- a/res/layout/data_usage_cycles.xml +++ b/res/layout/data_usage_cycles.xml @@ -20,8 +20,8 @@ android:layout_height="40dip" android:orientation="horizontal" android:gravity="center_vertical" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side"> + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight"> <TextView android:layout_width="wrap_content" diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml index 639fcf5..6c09d09 100644 --- a/res/layout/data_usage_detail.xml +++ b/res/layout/data_usage_detail.xml @@ -18,27 +18,30 @@ android:id="@+id/app_detail" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:visibility="gone"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@*android:dimen/preference_item_padding_side" - android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginRight="?android:attr/listPreferredItemPaddingRight" android:orientation="horizontal"> <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginRight="@*android:dimen/preference_item_padding_inner" + android:layout_marginTop="8dip" + android:layout_marginRight="8dip" android:orientation="vertical"> <ImageView android:id="@+id/app_icon" android:layout_width="48dip" android:layout_height="48dip" - android:scaleType="centerInside" /> + android:scaleType="centerInside" + android:contentDescription="@null" /> <LinearLayout android:id="@+id/app_titles" @@ -82,8 +85,8 @@ android:id="@+id/app_settings" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@*android:dimen/preference_item_padding_side" - android:layout_marginRight="@*android:dimen/preference_item_padding_side" + android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft" + android:layout_marginRight="?android:attr/listPreferredItemPaddingRight" android:layout_marginTop="16dip" android:layout_marginBottom="16dip" android:text="@string/data_usage_app_settings" /> diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml index aa2beb2..619956d 100644 --- a/res/layout/data_usage_header.xml +++ b/res/layout/data_usage_header.xml @@ -41,21 +41,10 @@ android:id="@+id/usage_summary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingTop="8dip" android:paddingBottom="8dip" - android:singleLine="true" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" - android:paddingBottom="8dip" - android:text="@string/data_usage_disclaimer" android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView @@ -63,8 +52,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" - android:paddingLeft="@*android:dimen/preference_item_padding_side" - android:paddingRight="@*android:dimen/preference_item_padding_side" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:paddingBottom="8dip" android:text="@string/data_usage_empty" android:textAppearance="?android:attr/textAppearanceSmall" /> diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml index d6a0dcb..3b4824f 100644 --- a/res/layout/device_admin_add.xml +++ b/res/layout/device_admin_add.xml @@ -44,7 +44,8 @@ android:layout_height="@android:dimen/app_icon_size" android:layout_marginRight="16dip" android:layout_gravity="center_vertical" - android:scaleType="fitCenter"/> + android:scaleType="fitCenter" + android:contentDescription="@null" /> <TextView android:id="@+id/admin_name" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -74,7 +75,8 @@ <ImageView android:id="@+id/add_msg_expander" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_vertical" /> + android:gravity="center_vertical" + android:contentDescription="@null" /> <TextView android:id="@+id/add_msg" android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml index fe9e45a..24dab5e 100644 --- a/res/layout/device_admin_item.xml +++ b/res/layout/device_admin_item.xml @@ -38,6 +38,7 @@ android:layout_width="@android:dimen/app_icon_size" android:layout_height="@android:dimen/app_icon_size" android:layout_gravity="center_vertical" + android:contentDescription="@null" /> </LinearLayout> diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml index 6b849ac..80911da 100644 --- a/res/layout/dialog_edittext.xml +++ b/res/layout/dialog_edittext.xml @@ -25,6 +25,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:maxLength="50" + android:singleLine="true" /> </LinearLayout> diff --git a/res/layout/manage_apps_tab_content.xml b/res/layout/dream_picker_row.xml index 3898227..18fe4f0 100644 --- a/res/layout/manage_apps_tab_content.xml +++ b/res/layout/dream_picker_row.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- /* -** ** Copyright 2011, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,25 +16,24 @@ ** limitations under the License. */ --> - -<TabHost - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/tabhost" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingLeft="2dip" + android:gravity="center_vertical"> - <LinearLayout - android:orientation="vertical" + <ImageView android:id="@+id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:scaleType="fitCenter" + android:contentDescription="@null" /> + + <TextView android:id="@+id/title" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:paddingLeft="6dip" /> - <include layout="@layout/tab_widget" /> - - <FrameLayout - android:id="@android:id/tabcontent" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1" /> +</LinearLayout> - </LinearLayout> -</TabHost> diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml index afec517..d69f98a 100644 --- a/res/layout/installed_app_details.xml +++ b/res/layout/installed_app_details.xml @@ -39,15 +39,24 @@ android:paddingTop="5dip" android:paddingBottom="5dip" > - <!-- Application snippet label, version and icon --> - <include - layout="@layout/manage_applications_item" - android:id="@+id/app_snippet"/> + <!-- Application snippet label, version and icon --> + <include + layout="@layout/manage_applications_item" + android:id="@+id/app_snippet"/> + + <!-- Force stop and uninstall buttons --> + <include + layout="@layout/two_buttons_panel" + android:id="@+id/control_buttons_panel"/> + + <!-- Ban notifications for this package --> + <CheckBox android:id="@+id/notification_switch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="12dip" + android:layout_gravity="left" + android:text="@string/app_notifications_switch_label" /> - <!-- Force stop and uninstall buttons --> - <include - layout="@layout/two_buttons_panel" - android:id="@+id/control_buttons_panel"/> </LinearLayout> <TextView @@ -86,7 +95,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/total_size_text" android:paddingTop="6dip" @@ -122,7 +132,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/application_size_text" android:textAppearance="?android:attr/textAppearanceMedium" @@ -159,7 +170,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/external_code_size_text" android:textAppearance="?android:attr/textAppearanceMedium" @@ -197,7 +209,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/data_size_text" android:textAppearance="?android:attr/textAppearanceMedium" @@ -234,7 +247,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/external_data_size_text" android:textAppearance="?android:attr/textAppearanceMedium" @@ -289,7 +303,8 @@ android:layout_marginLeft="1dip" android:layout_marginRight="1dip" android:layout_marginBottom="4dip" - android:scaleType="center" /> + android:scaleType="center" + android:contentDescription="@null" /> <TextView android:id="@+id/cache_size_text" android:textAppearance="?android:attr/textAppearanceMedium" @@ -310,7 +325,7 @@ </RelativeLayout> <!-- Prefered activities section --> - <TextView + <TextView android:id="@+id/auto_launch_title" style="?android:attr/listSeparatorTextViewStyle" android:layout_marginTop="8dip" android:text="@string/auto_launch_label" /> @@ -378,7 +393,7 @@ style="?android:attr/listSeparatorTextViewStyle" android:layout_marginTop="8dip" android:text="@string/permissions_label" /> - <TextView + <TextView android:id="@+id/security_settings_desc" android:text="@string/security_settings_desc" android:textAppearance="?android:attr/textAppearanceSmall" android:paddingTop="6dip" diff --git a/res/layout/keyboard_layout_dialog_switch_hint.xml b/res/layout/keyboard_layout_dialog_switch_hint.xml new file mode 100644 index 0000000..af8c3f4 --- /dev/null +++ b/res/layout/keyboard_layout_dialog_switch_hint.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <ImageView android:id="@+id/titleDivider" + android:layout_width="match_parent" + android:layout_height="1dip" + android:scaleType="fitXY" + android:gravity="fill_horizontal" + android:src="@android:drawable/divider_horizontal_dark" + android:contentDescription="@null" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/keyboard_layout_dialog_switch_hint" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorAlertDialogListItem" + android:minHeight="48dp" + android:gravity="center" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications_apps.xml index 7df2f54..51ab412 100755..100644 --- a/res/layout/manage_applications.xml +++ b/res/layout/manage_applications_apps.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project +<!-- Copyright (C) 2012 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. @@ -49,7 +49,9 @@ android:paddingTop="30dp" android:paddingLeft="4dp" android:paddingRight="4dp" - android:paddingBottom="1dp"> + android:paddingBottom="1dp" + android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" + android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"> <TextView android:id="@+id/usedStorageText" android:layout_width="0px" android:layout_height="wrap_content" @@ -81,16 +83,12 @@ </view> </LinearLayout> - <view class="com.android.settings.applications.RunningProcessesView" - android:id="@+id/running_processes" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <LinearLayout android:id="@+id/loading_container" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" + android:layout_marginRight="@*android:dimen/preference_fragment_padding_side" android:visibility="gone" android:gravity="center"> @@ -106,4 +104,4 @@ </LinearLayout> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/res/layout/manage_applications_content.xml b/res/layout/manage_applications_content.xml new file mode 100644 index 0000000..96ddeb3 --- /dev/null +++ b/res/layout/manage_applications_content.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <android.support.v4.view.ViewPager + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1"> + <android.support.v4.view.PagerTabStrip + android:id="@+id/tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:textAppearance="@style/TextAppearance.PagerTabs"> + </android.support.v4.view.PagerTabStrip> + </android.support.v4.view.ViewPager> + +</LinearLayout> diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml index 78d9a02..6708647 100755 --- a/res/layout/manage_applications_item.xml +++ b/res/layout/manage_applications_item.xml @@ -33,7 +33,8 @@ android:layout_height="@android:dimen/app_icon_size" android:layout_marginRight="11dip" android:layout_gravity="center_vertical" - android:scaleType="fitCenter"/> + android:scaleType="fitCenter" + android:contentDescription="@null"/> <LinearLayout android:orientation="vertical" diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml new file mode 100644 index 0000000..634de1c --- /dev/null +++ b/res/layout/manage_applications_running.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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="match_parent" + android:layout_height="match_parent" > + <view class="com.android.settings.applications.RunningProcessesView" + android:id="@+id/running_processes" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <LinearLayout android:id="@+id/loading_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" + android:layout_marginRight="@*android:dimen/preference_fragment_padding_side" + android:visibility="gone" + android:gravity="center"> + + <ProgressBar style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/settings_safetylegal_activity_loading" + android:paddingTop="4dip" + android:singleLine="true" /> + + </LinearLayout> + +</FrameLayout> diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml index e10c65f..5a7aee5 100644 --- a/res/layout/preference_bluetooth.xml +++ b/res/layout/preference_bluetooth.xml @@ -26,6 +26,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/nav_divider" + android:contentDescription="@null" /> <!-- Details button --> @@ -36,6 +37,7 @@ android:layout_gravity="center_vertical" android:padding="8dip" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_bt_config" /> + android:src="@drawable/ic_bt_config" + android:contentDescription="@string/bluetooth_device_details" /> </LinearLayout> diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml index 1ed971e..f8e6bdc 100644 --- a/res/layout/preference_bluetooth_profile.xml +++ b/res/layout/preference_bluetooth_profile.xml @@ -26,6 +26,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/nav_divider" + android:contentDescription="@null" /> <!-- Details button --> @@ -36,6 +37,7 @@ android:layout_gravity="center_vertical" android:padding="8dip" android:background="?android:attr/selectableItemBackground" - android:src="@drawable/ic_bt_config" /> + android:src="@drawable/ic_bt_config" + android:contentDescription="@string/bluetooth_profile_details" /> </LinearLayout> diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml index a6893e7..82c6f28 100644 --- a/res/layout/preference_dialog_brightness.xml +++ b/res/layout/preference_dialog_brightness.xml @@ -31,7 +31,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="20dip" - android:visibility="gone" /> + android:visibility="gone" + android:contentDescription="@null" /> <CheckBox android:id="@+id/automatic_mode" android:layout_width="match_parent" diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml index 2c83f12..a92f0ef 100644 --- a/res/layout/preference_dialog_ringervolume.xml +++ b/res/layout/preference_dialog_ringervolume.xml @@ -30,7 +30,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="20dip" - android:visibility="gone"/> + android:visibility="gone" + android:contentDescription="@null" /> <!-- Dummy --> <SeekBar android:id="@*android:id/seekbar" @@ -61,6 +62,7 @@ android:layout_height="wrap_content" android:padding="16dip" android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/volume_media_mute" /> <SeekBar android:id="@+id/media_volume_seekbar" @@ -101,6 +103,7 @@ android:layout_height="wrap_content" android:padding="16dip" android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/volume_ring_mute" /> <SeekBar android:id="@+id/ringer_volume_seekbar" @@ -143,6 +146,7 @@ android:layout_height="wrap_content" android:padding="16dip" android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/volume_notification_mute" /> <SeekBar android:id="@+id/notification_volume_seekbar" @@ -178,7 +182,7 @@ android:layout_height="wrap_content" android:padding="16dip" android:background="?android:attr/selectableItemBackground" - /> + android:contentDescription="@string/volume_alarm_mute" /> <SeekBar android:id="@+id/alarm_volume_seekbar" android:layout_width="0dip" android:layout_height="wrap_content" diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml new file mode 100644 index 0000000..28da8a1 --- /dev/null +++ b/res/layout/preference_header_item.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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 of a header item in PreferenceActivity. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dp" + android:background="?android:attr/activatedBackgroundIndicator" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize"> + + <LinearLayout + android:layout_width="@dimen/header_icon_width" + android:layout_marginLeft="6dip" + android:layout_marginRight="6dip" + android:layout_height="wrap_content"> + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="2dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + + <TextView android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignLeft="@android:id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:ellipsize="end" + android:maxLines="2" /> + + </RelativeLayout> + +</LinearLayout> diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml index 877ad7c..9d89c25 100644 --- a/res/layout/preference_header_switch_item.xml +++ b/res/layout/preference_header_switch_item.xml @@ -23,13 +23,17 @@ android:gravity="center_vertical" android:paddingRight="?android:attr/scrollbarSize"> - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <LinearLayout + android:layout_width="@dimen/header_icon_width" android:layout_marginLeft="6dip" android:layout_marginRight="6dip" - android:layout_gravity="center" /> + android:layout_height="wrap_content"> + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> <RelativeLayout android:layout_width="wrap_content" diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml index 51612ce..7660646 100644 --- a/res/layout/preference_icon.xml +++ b/res/layout/preference_icon.xml @@ -31,7 +31,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dip" android:layout_marginRight="6dip" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:contentDescription="@null" /> <RelativeLayout android:layout_width="wrap_content" diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml index 1d6b237..e6188dc 100644 --- a/res/layout/preference_powergauge.xml +++ b/res/layout/preference_powergauge.xml @@ -27,7 +27,8 @@ android:layout_width="48dip" android:layout_height="wrap_content" android:layout_marginRight="6dip" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:contentDescription="@null" /> <RelativeLayout android:layout_width="wrap_content" @@ -65,7 +66,8 @@ android:layout_width="match_parent" android:layout_marginTop="5dip" android:layout_below="@id/percent" - android:layout_gravity="center_vertical" /> + android:layout_gravity="center_vertical" + android:contentDescription="@null" /> <TextView android:id="@+android:id/summary" android:layout_width="wrap_content" diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml index 0a860af..ad782f2 100644 --- a/res/layout/preference_progress_category.xml +++ b/res/layout/preference_progress_category.xml @@ -21,7 +21,7 @@ android:orientation="horizontal" > - <!-- This and the other text view have the style of the list separator text view without the background and padding --> + <!-- This text view has the style of the list separator text view without the background and padding. --> <TextView style="?android:attr/listSeparatorTextViewStyle" android:background="@null" @@ -33,18 +33,6 @@ android:layout_gravity="left|bottom" /> - <TextView - style="?android:attr/listSeparatorTextViewStyle" - android:background="@null" - android:paddingLeft="0dip" - android:id="@+id/scanning_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="right|bottom" - android:text="@string/progress_scanning" - /> - <ProgressBar android:id="@+id/scanning_progress" android:text="@string/progress_scanning" diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml index a65e56f..960661f 100644 --- a/res/layout/preference_settings_checkbox_widget.xml +++ b/res/layout/preference_settings_checkbox_widget.xml @@ -36,7 +36,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:src="@drawable/nav_divider" /> + android:src="@drawable/nav_divider" + android:contentDescription="@null" /> <!-- CheckBox --> <CheckBox xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml index d8b4a75..f64c26c 100644 --- a/res/layout/preference_spellchecker.xml +++ b/res/layout/preference_spellchecker.xml @@ -46,7 +46,7 @@ android:id="@+android:id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceMedium" android:ellipsize="marquee" android:fadingEdge="horizontal" /> @@ -70,7 +70,8 @@ android:gravity="center_vertical" android:clickable="true" android:focusable="true" - android:background="?android:attr/selectableItemBackground" > + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/spellchecker_quick_settings" > <View android:layout_width="2dip" android:layout_height="match_parent" @@ -83,7 +84,8 @@ android:paddingLeft="5dip" android:paddingRight="5dip" android:src="@drawable/ic_sysbar_quicksettings" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:contentDescription="@string/spellchecker_quick_settings" /> </LinearLayout> <View android:id="@+id/pref_right_separator2" @@ -102,5 +104,6 @@ android:layout_gravity="right" android:clickable="true" android:focusable="true" - android:background="?android:attr/selectableItemBackground" /> + android:background="?android:attr/selectableItemBackground" + android:contentDescription="@string/spellchecker_language" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml index 5057aab..7cb2997 100644 --- a/res/layout/preference_widget_sync_toggle.xml +++ b/res/layout/preference_widget_sync_toggle.xml @@ -27,14 +27,16 @@ android:src="@drawable/ic_sync_error_holo" android:layout_width="wrap_content" android:layout_marginRight="8dip" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:contentDescription="@string/sync_failed" /> <com.android.settings.widget.AnimatedImageView android:id="@+id/sync_active" android:src="@drawable/ic_list_sync_anim" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" /> + android:layout_marginRight="8dip" + android:contentDescription="@string/sync_active" /> <CheckBox xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/checkbox" diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml index a4e8763..6df203c 100644 --- a/res/layout/preference_widget_wifi_signal.xml +++ b/res/layout/preference_widget_wifi_signal.xml @@ -18,4 +18,5 @@ android:id="@+id/signal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/wifi_signal" /> + android:src="@drawable/wifi_signal" + android:contentDescription="@null" /> diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml index 3a113e0..9967f77 100644 --- a/res/layout/profile_icon_small.xml +++ b/res/layout/profile_icon_small.xml @@ -20,4 +20,5 @@ android:layout_height="30dp" android:layout_marginRight="4dip" android:gravity="center" - android:layout_gravity="center_vertical" /> + android:layout_gravity="center_vertical" + android:contentDescription="@null" /> diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml index dacee9e..f46527a 100644 --- a/res/layout/running_processes_item.xml +++ b/res/layout/running_processes_item.xml @@ -38,7 +38,8 @@ android:layout_height="@android:dimen/app_icon_size" android:layout_marginRight="11dip" android:layout_gravity="center_vertical" - android:scaleType="fitCenter"/> + android:scaleType="fitCenter" + android:contentDescription="@null" /> <LinearLayout android:orientation="vertical" diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml index 3558e92..e23de16 100644 --- a/res/layout/running_processes_view.xml +++ b/res/layout/running_processes_view.xml @@ -26,7 +26,10 @@ <ListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingLeft="@*android:dimen/preference_fragment_padding_side" + android:paddingRight="@*android:dimen/preference_fragment_padding_side" android:drawSelectorOnTop="false" + android:scrollbarStyle="outsideOverlay" android:fastScrollEnabled="true" /> <TextView android:id="@android:id/empty" android:layout_width="match_parent" @@ -46,7 +49,9 @@ android:paddingTop="30dp" android:paddingLeft="4dp" android:paddingRight="4dp" - android:paddingBottom="1dp"> + android:paddingBottom="1dp" + android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side" + android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"> <TextView android:id="@+id/foregroundText" android:layout_width="0px" android:layout_height="wrap_content" diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml new file mode 100644 index 0000000..79d59b3 --- /dev/null +++ b/res/layout/setup_preference.xml @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2012, 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. +*/ +--> +<view + xmlns:android="http://schemas.android.com/apk/res/android" + class="com.android.settings.wifi.WifiSettings$ProportionalOuterFrame" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <RelativeLayout + android:id="@+id/title_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:gravity="bottom"> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/title" + android:gravity="bottom" + android:orientation="horizontal"> + <TextView + android:id="@+id/title" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1.0" + style="@style/SetupTitle" + android:text="@string/wifi_setup_wizard_title" + android:gravity="bottom" /> + + <ImageButton + android:id="@+id/more" + android:layout_width="@dimen/setup_button_size" + android:layout_height="@dimen/setup_button_size" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" + android:layout_marginBottom="8dip" + android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark" + android:background="?android:attr/actionBarItemBackground" + android:contentDescription="@string/wifi_menu_wps_pbc" /> + + </LinearLayout> + + <!-- Divider --> + <View + android:id="@+id/top_divider" + style="@style/TopDivider" + android:layout_below="@id/button_bar" /> + + </RelativeLayout> + + <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/title_area" + android:background="@android:color/transparent" + android:orientation="vertical" > + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" + android:cacheColorHint="@android:color/transparent" + android:clipToPadding="false" + android:drawSelectorOnTop="false" + android:paddingTop="0dip" + android:scrollbarAlwaysDrawVerticalTrack="true" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:visibility="gone" /> + + <ImageView + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/setup_item_margin" + android:background="@*android:drawable/list_divider_holo_dark" /> + + <LinearLayout + android:id="@+id/other_network" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/setup_item_margin" + android:background="?android:attr/selectableItemBackground" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingRight="?android:attr/scrollbarSize" > + + <ImageView + android:id="@+id/add_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:src="@drawable/ic_menu_add" /> + + <TextView + android:id="@+id/other" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="6dip" + android:layout_marginLeft="15dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_weight="1" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/wifi_other_network" /> + + </LinearLayout> + + <RelativeLayout + android:id="@+id/button_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:visibility="gone" > + + <Button + android:id="@+id/back_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_margin="5dip" + android:text="@string/wifi_setup_back" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:orientation="horizontal" > + + <Button + android:id="@+id/skip_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@string/wifi_setup_skip" + android:visibility="gone" /> + + <Button + android:id="@+id/next_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@string/wifi_setup_next" /> + </LinearLayout> + </RelativeLayout> + </LinearLayout> +</view>
\ No newline at end of file diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml index eeaa81b..7d73f58 100644 --- a/res/layout/text_description_preference.xml +++ b/res/layout/text_description_preference.xml @@ -24,7 +24,7 @@ android:id="@+id/summary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" + android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="?android:attr/textColorSecondary" android:padding="16dip" /> diff --git a/res/layout/title.xml b/res/layout/title.xml index 63a30a7..eb2222b 100644 --- a/res/layout/title.xml +++ b/res/layout/title.xml @@ -27,7 +27,8 @@ android:layout_width="48dip" android:layout_height="48dip" android:layout_margin="5dip" - android:layout_gravity="center_vertical" /> + android:layout_gravity="center_vertical" + android:contentDescription="@null" /> <LinearLayout android:layout_width="0dip" diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml new file mode 100644 index 0000000..4089299 --- /dev/null +++ b/res/layout/user_dictionary_add_word.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/user_dict_settings_add_dialog_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <com.android.internal.widget.DialogTitle + style="?android:attr/windowTitleStyle" + android:singleLine="true" + android:ellipsize="end" + android:layout_width="match_parent" + android:layout_height="64dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:gravity="center_vertical|left" + android:text="@string/user_dict_settings_add_dialog_title" /> + <View android:layout_width="match_parent" + android:layout_height="2dip" + android:background="@android:color/holo_blue_light" /> + </LinearLayout> + + <EditText android:id="@+id/user_dictionary_add_word_text" + android:maxLength="@integer/maximum_user_dictionary_word_length" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_gravity="fill_horizontal|center_vertical" + android:layout_marginLeft="8dip" + android:layout_marginBottom="8dip" + android:layout_marginTop="8dip" + android:inputType="textNoSuggestions" + android:imeOptions="flagNoFullscreen"> + <requestFocus /> + </EditText> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="beginning" + android:dividerPadding="0dip"> + <LinearLayout style="?android:attr/buttonBarStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:measureWithLargestChild="true"> + <Button android:layout_width="0dip" + android:layout_gravity="left" + android:layout_weight="1" + android:maxLines="2" + style="?android:attr/buttonBarButtonStyle" + android:textSize="14sp" + android:text="@string/cancel" + android:layout_height="wrap_content" + android:onClick="onClickCancel" /> + <Button android:layout_width="0dip" + android:layout_gravity="right" + android:layout_weight="1" + android:maxLines="2" + style="?android:attr/buttonBarButtonStyle" + android:textSize="14sp" + android:text="@string/user_dict_settings_add_dialog_confirm" + android:layout_height="wrap_content" + android:onClick="onClickConfirm" /> + </LinearLayout> + </LinearLayout> +</LinearLayout> diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml new file mode 100644 index 0000000..c0f3f53 --- /dev/null +++ b/res/layout/user_dictionary_add_word_fullscreen.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/user_dict_settings_add_dialog_top" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:text="@string/user_dict_settings_add_screen_title" + style="?android:attr/listSeparatorTextViewStyle" /> + + <EditText android:id="@+id/user_dictionary_add_word_text" + android:maxLength="@integer/maximum_user_dictionary_word_length" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_gravity="fill_horizontal|center_vertical" + android:layout_marginLeft="8dip" + android:layout_marginBottom="8dip" + android:layout_marginTop="8dip" + android:inputType="textNoSuggestions" + android:imeOptions="flagNoFullscreen"> + <requestFocus /> + </EditText> + <GridLayout android:id="@+id/user_dictionary_add_word_grid" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="8dip" + android:layout_marginRight="8dip" + android:columnCount="2"> + <TextView android:id="@+id/user_dictionary_add_shortcut_label" + style="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:text="@string/user_dict_settings_add_shortcut_option_name" /> + <EditText android:id="@+id/user_dictionary_add_shortcut" + android:maxLength="@integer/maximum_user_dictionary_word_length" + android:layout_width="wrap_content" + android:layout_gravity="fill_horizontal|center_vertical" + android:layout_marginLeft="8dip" + android:layout_marginBottom="8dip" + android:layout_marginTop="8dip" + android:inputType="textNoSuggestions" + android:imeOptions="flagNoFullscreen" /> + <TextView android:id="@+id/user_dictionary_add_locale_label" + style="?android:attr/textAppearanceSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center_vertical" + android:text="@string/user_dict_settings_add_locale_option_name" /> + <Spinner android:id="@+id/user_dictionary_add_locale" + android:layout_marginLeft="8dip" + android:layout_marginBottom="8dip" + android:layout_marginTop="8dip" + android:layout_width="wrap_content" + android:layout_gravity="fill_horizontal|center_vertical" /> + </GridLayout> +</LinearLayout> diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml index aaf3cbd..749986e 100644 --- a/res/layout/user_dictionary_item.xml +++ b/res/layout/user_dictionary_item.xml @@ -15,36 +15,38 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@android:id/text1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical" - android:paddingLeft="16dip" - android:minHeight="?android:attr/listPreferredItemHeight"/> - - <ImageView - android:id="@+id/divider" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:layout_marginLeft="8dip" - android:src="@drawable/nav_divider" - /> - - <ImageView - android:id="@+id/delete_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="8dip" - android:src="@drawable/ic_item_delete" - android:background="?android:attr/selectableItemBackground" - /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:paddingRight="?android:attr/scrollbarSize" + android:background="?android:attr/selectableItemBackground" > + + <RelativeLayout android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="15dip" + android:layout_marginRight="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + + <TextView android:id="@+android:id/text1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+android:id/text2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/text1" + android:layout_alignLeft="@android:id/text1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + android:maxLines="1" /> + + </RelativeLayout> + </LinearLayout> diff --git a/res/layout/widget.xml b/res/layout/widget.xml index fa8f3de..d000a46 100644 --- a/res/layout/widget.xml +++ b/res/layout/widget.xml @@ -38,6 +38,7 @@ android:layout_height="0dip" android:layout_weight="1" android:scaleType="center" + android:contentDescription="@null" /> <ImageView @@ -45,6 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" + android:contentDescription="@null" /> </LinearLayout> @@ -52,6 +54,7 @@ android:layout_width="1dip" android:layout_height="match_parent" android:background="@drawable/appwidget_settings_divider_holo" + android:contentDescription="@null" /> <LinearLayout @@ -71,6 +74,7 @@ android:layout_height="0dip" android:layout_weight="1" android:scaleType="center" + android:contentDescription="@null" /> <ImageView @@ -78,6 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" + android:contentDescription="@null" /> </LinearLayout> @@ -86,6 +91,7 @@ android:layout_width="1dip" android:layout_height="match_parent" android:background="@drawable/appwidget_settings_divider_holo" + android:contentDescription="@null" /> <LinearLayout @@ -105,6 +111,7 @@ android:layout_height="0dip" android:layout_weight="1" android:scaleType="center" + android:contentDescription="@null" /> <ImageView @@ -112,6 +119,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" + android:contentDescription="@null" /> </LinearLayout> @@ -119,6 +127,7 @@ android:layout_width="1dip" android:layout_height="match_parent" android:background="@drawable/appwidget_settings_divider_holo" + android:contentDescription="@null" /> <LinearLayout @@ -138,6 +147,7 @@ android:layout_height="0dip" android:layout_weight="1" android:scaleType="center" + android:contentDescription="@null" /> <ImageView @@ -145,6 +155,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" + android:contentDescription="@null" /> </LinearLayout> @@ -152,6 +163,7 @@ android:layout_width="1dip" android:layout_height="match_parent" android:background="@drawable/appwidget_settings_divider_holo" + android:contentDescription="@null" /> <LinearLayout @@ -171,6 +183,7 @@ android:layout_height="0dip" android:layout_weight="1" android:scaleType="center" + android:contentDescription="@null" /> <ImageView @@ -178,6 +191,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" + android:contentDescription="@null" /> </LinearLayout> diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml deleted file mode 100644 index 6103fb9..0000000 --- a/res/layout/wifi_config_preference.xml +++ /dev/null @@ -1,346 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!-- All ids in this layout must be in wifi_dialog.xml --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout android:id="@+id/info" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - - <LinearLayout android:id="@+id/setup_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_network_setup" /> - - <Spinner android:id="@+id/network_setup" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_network_setup" - android:entries="@array/wifi_network_setup" /> - - </LinearLayout> - - <LinearLayout android:id="@+id/wps_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_wps_pin" /> - - <EditText android:id="@+id/wps_pin" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textPassword" /> - - </LinearLayout> - - - - <LinearLayout android:id="@+id/type" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_ssid" /> - - <EditText android:id="@+id/ssid" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_security" /> - - <Spinner android:id="@+id/security" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_security" - android:entries="@array/wifi_security" /> - </LinearLayout> <!-- android:id="@+id/type" --> - - <LinearLayout android:id="@+id/security_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <LinearLayout android:id="@+id/eap" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_eap_method" /> - - <Spinner android:id="@+id/method" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_method" - android:entries="@array/wifi_eap_method" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/please_select_phase2" /> - - <Spinner android:id="@+id/phase2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/please_select_phase2" - android:entries="@array/wifi_phase2_entries" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_eap_ca_cert" /> - - <Spinner android:id="@+id/ca_cert" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_ca_cert" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_eap_user_cert" /> - - <Spinner android:id="@+id/user_cert" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_user_cert" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_eap_identity" /> - - <EditText android:id="@+id/identity" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_eap_anonymous" /> - - <EditText android:id="@+id/anonymous" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> - </LinearLayout> <!-- android:id="@+id/eap" --> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_password" /> - - <EditText android:id="@+id/password" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:password="true" /> - - <CheckBox android:id="@+id/show_password" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_show_password" /> - </LinearLayout> <!-- android:id="@+id/security_fields" --> - - <LinearLayout android:id="@+id/proxy_settings_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/proxy_settings_title" /> - - <Spinner android:id="@+id/proxy_settings" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/proxy_settings_title" - android:entries="@array/wifi_proxy_settings" /> - </LinearLayout> - - <LinearLayout android:id="@+id/proxy_warning_limited_support" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <!-- Dummy to enable right-justification of warning --> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/proxy_warning_limited_support" /> - </LinearLayout> - - <LinearLayout android:id="@+id/proxy_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/proxy_hostname_label" /> - - <EditText android:id="@+id/proxy_hostname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" - android:hint="@string/proxy_hostname_hint" /> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/proxy_port_label" /> - - <EditText android:id="@+id/proxy_port" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="number" - android:hint="@string/proxy_port_hint" /> - - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/proxy_exclusionlist_label" /> - - <EditText android:id="@+id/proxy_exclusionlist" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" - android:hint="@string/proxy_exclusionlist_hint" /> - - </LinearLayout> - - <LinearLayout android:id="@+id/ip_fields" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_ip_settings" /> - - <Spinner android:id="@+id/ip_settings" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_ip_settings" - android:entries="@array/wifi_ip_settings" /> - </LinearLayout> - - <LinearLayout android:id="@+id/staticip" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_ip_address" /> - - <EditText android:id="@+id/ipaddress" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="wifi_ip_address_hint" - android:inputType="textNoSuggestions" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_gateway" /> - - <EditText android:id="@+id/gateway" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="wifi_gateway_hint" - android:inputType="textNoSuggestions" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_network_prefix_length" /> - - <EditText android:id="@+id/network_prefix_length" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="wifi_network_prefix_length_hint" - android:inputType="number" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_dns1" /> - - <EditText android:id="@+id/dns1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="wifi_dns1_hint" - android:inputType="textNoSuggestions" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_dns2" /> - - <EditText android:id="@+id/dns2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:hint="wifi_dns2_hint" - android:inputType="textNoSuggestions" /> - </LinearLayout> - -</LinearLayout> diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml index 138458b..1b10f90 100644 --- a/res/layout/wifi_config_ui_for_setup_wizard.xml +++ b/res/layout/wifi_config_ui_for_setup_wizard.xml @@ -52,30 +52,6 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textSize="20sp" /> </FrameLayout> - <LinearLayout - android:id="@+id/wps_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - <TextView - android:layout_width="match_parent" - android:minWidth="128dip" - android:layout_height="wrap_content" - android:text="@string/wifi_wps_pin" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="20sp" - android:gravity="bottom" /> - - <EditText - android:id="@+id/wps_pin" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textPassword" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="20sp" /> - </LinearLayout> <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -204,44 +180,6 @@ android:layout_height="wrap_content" android:orientation="vertical"/> - <LinearLayout android:id="@+id/setup_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_network_setup" /> - - <Spinner android:id="@+id/network_setup" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_network_setup" - android:entries="@array/wifi_network_setup" /> - - </LinearLayout> - - <!-- - <LinearLayout android:id="@+id/wps_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_wps_pin" /> - - <EditText android:id="@+id/wps_pin" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textPassword" /> - </LinearLayout> --> - <!-- android:id="@+id/security_fields" --> <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index f27ede9..88dae27 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content"> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -180,35 +180,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:visibility="gone"> - <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/proxy_settings_fields" style="@style/wifi_item" diff --git a/res/layout/wifi_p2p_dialog.xml b/res/layout/wifi_p2p_dialog.xml deleted file mode 100644 index 7a86c1e..0000000 --- a/res/layout/wifi_p2p_dialog.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?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. ---> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="300sp" - android:layout_height="wrap_content"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="8dip" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_p2p_device_info" /> - - <TextView android:id="@+id/device_name" - style="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" /> - - <TextView android:id="@+id/device_address" - style="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" /> - - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_p2p_wps_setup" /> - - <Spinner android:id="@+id/wps_setup" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_p2p_wps_setup" - android:entries="@array/wifi_p2p_wps_setup" /> - - <LinearLayout android:id="@+id/wps_pin_entry" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <TextView - style="@style/wifi_item_label" - android:text="@string/wifi_p2p_wps_pin" /> - - <EditText android:id="@+id/wps_pin" - style="@style/wifi_item_content" - android:singleLine="true" - android:inputType="textPassword" /> - </LinearLayout> - - - <CheckBox android:id="@+id/persist_network" - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_p2p_persist_network" /> - - </LinearLayout> -</ScrollView> diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml new file mode 100644 index 0000000..1c5713a --- /dev/null +++ b/res/layout/wifi_wps_dialog.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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="300sp" + android:layout_height="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="8dip" + android:orientation="vertical"> + + <TextView + android:id="@+id/wps_dialog_txt" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="8dip" + android:src="@drawable/ic_wps" /> + + <ProgressBar + android:id="@+id/wps_timeout_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dip" + style="?android:attr/progressBarStyleHorizontal" /> + + <ProgressBar + android:id="@+id/wps_progress_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dip" + style="?android:attr/progressBarStyle" /> + + <RelativeLayout + android:gravity="center" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <Button + android:id="@+id/wps_dialog_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/cancel" /> + </RelativeLayout> + </LinearLayout> +</ScrollView> |