diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_menu_add.png | bin | 534 -> 667 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_menu_add.png | bin | 476 -> 596 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_menu_add.png | bin | 610 -> 761 bytes | |||
| -rw-r--r-- | res/layout/setup_preference.xml | 55 | ||||
| -rw-r--r-- | res/menu/wifi_setup.xml | 21 | ||||
| -rwxr-xr-x | res/values-sw600dp/dimens.xml | 1 | ||||
| -rwxr-xr-x | res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
8 files changed, 72 insertions, 12 deletions
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png Binary files differindex 9f7d982..4b68f52 100644 --- a/res/drawable-hdpi/ic_menu_add.png +++ b/res/drawable-hdpi/ic_menu_add.png diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png Binary files differindex 254a572..15ffadd 100644 --- a/res/drawable-mdpi/ic_menu_add.png +++ b/res/drawable-mdpi/ic_menu_add.png diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png Binary files differindex 6b1df2f..420510e 100644 --- a/res/drawable-xhdpi/ic_menu_add.png +++ b/res/drawable-xhdpi/ic_menu_add.png diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml index f90daa4..79d59b3 100644 --- a/res/layout/setup_preference.xml +++ b/res/layout/setup_preference.xml @@ -46,23 +46,13 @@ android:gravity="bottom" /> <ImageButton - android:id="@+id/add_network" - android:layout_width="@dimen/setup_button_size" - android:layout_height="@dimen/setup_button_size" - android:layout_marginLeft="8dip" - android:layout_marginBottom="8dip" - android:src="@drawable/ic_menu_add" - android:background="?android:attr/actionBarItemBackground" - android:contentDescription="@string/wifi_add_network" /> - - <ImageButton - android:id="@+id/wps_push" + 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="@drawable/ic_wps" + android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark" android:background="?android:attr/actionBarItemBackground" android:contentDescription="@string/wifi_menu_wps_pbc" /> @@ -102,6 +92,47 @@ 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" diff --git a/res/menu/wifi_setup.xml b/res/menu/wifi_setup.xml new file mode 100644 index 0000000..91d5516 --- /dev/null +++ b/res/menu/wifi_setup.xml @@ -0,0 +1,21 @@ +<?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. +--> + +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/wifi_wps" + android:title="@string/wifi_setup_wps" /> +</menu> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index e3c1bd2..80d5368 100755 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -29,4 +29,5 @@ <item type="dimen" name="setup_border_width">10%</item> <dimen name="setup_margin_bottom">0dip</dimen> <dimen name="setup_button_size">48dip</dimen> + <dimen name="setup_item_margin">32dip</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 49474fa..c397209 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -41,6 +41,7 @@ <dimen name="setup_margin_bottom">0dip</dimen> <dimen name="setup_title_size">25sp</dimen> <dimen name="setup_button_size">32dip</dimen> + <dimen name="setup_item_margin">16dip</dimen> <dimen name="divider_height">3dip</dimen> <dimen name="divider_margin_top">6dip</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index e1ca016..becfff3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1230,6 +1230,12 @@ <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string> <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]--> <string name="wifi_empty_list_wifi_on">Searching for Wi-Fi networks\u2026</string> + <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]--> + <string name="wifi_other_network">Other network\u2026</string> + <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]--> + <string name="wifi_more">More</string> + <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]--> + <string name="wifi_setup_wps">Automatic setup (WPS)</string> <!-- Dialog for Access Points --> <skip /> <!-- Label to show/hide advanced options --> |
