summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2011-03-07 19:24:01 -0800
committerDaisuke Miyakawa <dmiyakawa@google.com>2011-03-07 19:26:06 -0800
commit6eb99799103d8b92e42ea74e14875021a3432645 (patch)
treedb9bd2856605cfb5349983cf8de663c8b686f243 /res
parent0c0249b0ea3f64c1258292e9b3a9b89f46368f3c (diff)
downloadpackages_apps_settings-6eb99799103d8b92e42ea74e14875021a3432645.zip
packages_apps_settings-6eb99799103d8b92e42ea74e14875021a3432645.tar.gz
packages_apps_settings-6eb99799103d8b92e42ea74e14875021a3432645.tar.bz2
Use consistent indent
Not all indents but just relevant ones are fixed. Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
Diffstat (limited to 'res')
-rw-r--r--res/layout/wifi_config_ui_for_setup_wizard.xml287
1 files changed, 155 insertions, 132 deletions
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index cc8d586..138458b 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -14,156 +14,179 @@
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="match_parent"
- android:layout_height="match_parent">
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<!-- UI components that should be shown appropriately -->
- <FrameLayout android:id="@+id/eap_not_supported"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="360dip"
- android:orientation="vertical"
- android:visibility="gone">
- <TextView android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:lineSpacingExtra="12dip"
- android:text="@string/wifi_setup_eap_not_supported"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp" />
+ <FrameLayout
+ android:id="@+id/eap_not_supported"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="360dip"
+ android:orientation="vertical"
+ android:visibility="gone">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lineSpacingExtra="12dip"
+ android:text="@string/wifi_setup_eap_not_supported"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp" />
</FrameLayout>
<!-- In "add network" flow, we have security type field (@id/security below) below
this View, so need a bit different layout than the other flow, in which we'll use
@id/eap_not_supported. -->
- <FrameLayout android:id="@+id/eap_not_supported_for_add_network"
- 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:lineSpacingExtra="12dip"
- android:text="@string/wifi_setup_eap_not_supported"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp" />
+ <FrameLayout
+ android:id="@+id/eap_not_supported_for_add_network"
+ 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:lineSpacingExtra="12dip"
+ android:text="@string/wifi_setup_eap_not_supported"
+ 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
+ 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"
- android:layout_marginBottom="16dip">
+ <TableLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dip">
<!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
@id/type_ssid and @id/type_security. -->
- <TableRow android:id="@+id/type_ssid"
- android:minHeight="56dip"
- android:visibility="gone">
- <TextView android:id="@+id/ssid_text"
- android:layout_width="wrap_content"
- android:minWidth="128dip"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:paddingRight="16dip"
- android:layout_alignParentLeft="true"
- android:text="@string/wifi_ssid"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp"
- android:gravity="left|center_vertical" />
-
- <FrameLayout android:id="@+id/ssid_layout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@id/ssid_text"
- android:layout_toRightOf="@id/ssid_text">
- <EditText android:id="@+id/ssid"
- android:layout_width="368dip"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:inputType="textNoSuggestions"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp" />
+ <TableRow
+ android:id="@+id/type_ssid"
+ android:minHeight="56dip"
+ android:visibility="gone">
+ <TextView
+ android:id="@+id/ssid_text"
+ android:layout_width="wrap_content"
+ android:minWidth="128dip"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:paddingRight="16dip"
+ android:layout_alignParentLeft="true"
+ android:text="@string/wifi_ssid"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp"
+ android:gravity="left|center_vertical" />
+
+ <FrameLayout
+ android:id="@+id/ssid_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@id/ssid_text"
+ android:layout_toRightOf="@id/ssid_text">
+ <EditText
+ android:id="@+id/ssid"
+ android:layout_width="368dip"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:inputType="textNoSuggestions"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp" />
</FrameLayout>
</TableRow>
- <TableRow android:id="@+id/security_fields"
- android:minHeight="56dip"
- android:visibility="gone">
- <TextView android:id="@+id/password_text"
- android:layout_width="wrap_content"
- android:minWidth="128dip"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:text="@string/wifi_password"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp"
- android:gravity="left|center_vertical" />
-
- <LinearLayout android:id="@+id/password_layout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="bottom">
- <EditText android:id="@+id/password"
- android:layout_width="368dip"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:singleLine="true"
- android:password="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp" />
+ <TableRow
+ android:id="@+id/security_fields"
+ android:minHeight="56dip"
+ android:visibility="gone">
+ <TextView
+ android:id="@+id/password_text"
+ android:layout_width="wrap_content"
+ android:minWidth="128dip"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:text="@string/wifi_password"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp"
+ android:gravity="left|center_vertical" />
+
+ <LinearLayout
+ android:id="@+id/password_layout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="bottom">
+ <EditText
+ android:id="@+id/password"
+ android:layout_width="368dip"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:singleLine="true"
+ android:password="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp" />
</LinearLayout>
<!-- It looks CheckBox isn't aligned well with TableRow -->
- <FrameLayout android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <CheckBox android:id="@+id/show_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:text="@string/wifi_show_password"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp" />
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <CheckBox
+ android:id="@+id/show_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:text="@string/wifi_show_password"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp" />
</FrameLayout>
</TableRow>
- <TableRow android:id="@+id/type_security"
- android:minHeight="56dip"
- android:visibility="gone">
- <TextView android:id="@+id/security_text"
- android:layout_width="wrap_content"
- android:minWidth="128dip"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:text="@string/wifi_security"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="20sp"
- android:gravity="bottom"/>
-
- <FrameLayout android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="bottom">
- <Spinner android:id="@+id/security"
- android:layout_width="368dip"
- android:layout_height="wrap_content"
- android:minHeight="56dip"
- android:paddingLeft="4dip"/>
+ <TableRow
+ android:id="@+id/type_security"
+ android:minHeight="56dip"
+ android:visibility="gone">
+ <TextView
+ android:id="@+id/security_text"
+ android:layout_width="wrap_content"
+ android:minWidth="128dip"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:text="@string/wifi_security"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="20sp"
+ android:gravity="bottom"/>
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="bottom">
+ <Spinner
+ android:id="@+id/security"
+ android:layout_width="368dip"
+ android:layout_height="wrap_content"
+ android:minHeight="56dip"
+ android:paddingLeft="4dip"/>
</FrameLayout>
</TableRow>
</TableLayout>