PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UI for WifiSettings for XL screen

Browse Source 
Change-Id: I874e1e8d86e8b219414f6bf2ff945ea4f9ab7a6c
This commit is contained in:
Daisuke Miyakawa
2010-11-04 12:21:45 -07:00
parent 897e9df8e6
commit 8b3b876c09
5 changed files with 105 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
View File

@@ -93,12 +93,6 @@
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true">
<Button android:id="@+id/wifi_setup_connect"
android:layout_width="260dip"
android:layout_height="60dip"
android:textSize="24dip"
android:text="@string/wifi_connect"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_forget"
android:layout_width="260dip"
android:layout_height="60dip"
@@ -106,6 +100,14 @@
android:text="@string/wifi_forget"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_connect"
android:layout_width="260dip"
android:layout_height="60dip"
android:layout_marginTop="20dip"
android:textSize="24dip"
android:text="@string/wifi_connect"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_add_network"
android:layout_width="260dip"
android:layout_height="60dip"
@@ -134,7 +136,6 @@
android:layout_height="60dip"
android:layout_above="@+id/wifi_setup_cancel"
android:layout_alignLeft="@+id/wifi_setup_cancel"
android:layout_marginBottom="30dip"
android:textSize="24dip"
android:text="@string/wifi_detail"
android:visibility="gone" />
@@ -142,6 +143,7 @@
<Button android:id="@+id/wifi_setup_cancel"
android:layout_width="260dip"
android:layout_height="60dip"
android:layout_marginTop="20dip"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/right_buttons"
android:textSize="24dip"

52
res/layout/wifi_config_preference2.xml
View File

@@ -56,7 +56,32 @@
android:layout_height="wrap_content"
android:text="@string/wifi_show_password" />
</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" -->
<!-- All the views below are "gone".
We want them as data storage, not as UI components. -->
@@ -109,33 +134,6 @@
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" -->
<!-- android:id="@+id/security_fields" -->
<LinearLayout
android:layout_width="fill_parent"