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

Use consistent indent

Browse Source 
Not all indents but just relevant ones are fixed.

Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
This commit is contained in:
Daisuke Miyakawa
2011-03-07 19:24:01 -08:00
parent 0c0249b0ea
commit 6eb9979910
1 changed files with 151 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

279
res/layout/wifi_config_ui_for_setup_wizard.xml
View File

@@ -14,156 +14,179 @@
limitations under the License. limitations under the License.
--> -->
<!-- All ids in this layout must be in wifi_dialog.xml --> <!-- All ids in this layout must be in wifi_dialog.xml -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="match_parent"> android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- UI components that should be shown appropriately --> <!-- UI components that should be shown appropriately -->
<FrameLayout android:id="@+id/eap_not_supported" <FrameLayout
android:layout_width="match_parent" android:id="@+id/eap_not_supported"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:minHeight="360dip" android:layout_height="wrap_content"
android:orientation="vertical" android:minHeight="360dip"
android:visibility="gone"> android:orientation="vertical"
<TextView android:layout_width="match_parent" android:visibility="gone">
android:layout_height="wrap_content" <TextView
android:lineSpacingExtra="12dip" android:layout_width="match_parent"
android:text="@string/wifi_setup_eap_not_supported" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:lineSpacingExtra="12dip"
android:textSize="20sp" /> android:text="@string/wifi_setup_eap_not_supported"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</FrameLayout> </FrameLayout>
<!-- In "add network" flow, we have security type field (@id/security below) below <!-- 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 this View, so need a bit different layout than the other flow, in which we'll use
@id/eap_not_supported. --> @id/eap_not_supported. -->
<FrameLayout android:id="@+id/eap_not_supported_for_add_network" <FrameLayout
android:layout_width="match_parent" android:id="@+id/eap_not_supported_for_add_network"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:visibility="gone"> android:orientation="vertical"
<TextView android:layout_width="match_parent" android:visibility="gone">
android:layout_height="wrap_content" <TextView
android:lineSpacingExtra="12dip" android:layout_width="match_parent"
android:text="@string/wifi_setup_eap_not_supported" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:lineSpacingExtra="12dip"
android:textSize="20sp" /> android:text="@string/wifi_setup_eap_not_supported"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</FrameLayout> </FrameLayout>
<LinearLayout android:id="@+id/wps_fields" <LinearLayout
android:layout_width="match_parent" android:id="@+id/wps_fields"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
android:visibility="gone"> android:orientation="vertical"
<TextView android:layout_width="match_parent" android:visibility="gone">
android:minWidth="128dip" <TextView
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="@string/wifi_wps_pin" android:minWidth="128dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_height="wrap_content"
android:textSize="20sp" android:text="@string/wifi_wps_pin"
android:gravity="bottom" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
android:gravity="bottom" />
<EditText android:id="@+id/wps_pin" <EditText
android:layout_width="match_parent" android:id="@+id/wps_pin"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:singleLine="true" android:layout_height="wrap_content"
android:inputType="textPassword" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:inputType="textPassword"
android:textSize="20sp" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</LinearLayout> </LinearLayout>
<TableLayout android:layout_width="match_parent" <TableLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginBottom="16dip"> android:layout_height="wrap_content"
android:layout_marginBottom="16dip">
<!-- To accomodate @id/type into TableLayout, we splitted the layout into two: <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
@id/type_ssid and @id/type_security. --> @id/type_ssid and @id/type_security. -->
<TableRow android:id="@+id/type_ssid" <TableRow
android:minHeight="56dip" android:id="@+id/type_ssid"
android:visibility="gone"> android:minHeight="56dip"
<TextView android:id="@+id/ssid_text" android:visibility="gone">
android:layout_width="wrap_content" <TextView
android:minWidth="128dip" android:id="@+id/ssid_text"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:minHeight="56dip" android:minWidth="128dip"
android:paddingRight="16dip" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:minHeight="56dip"
android:text="@string/wifi_ssid" android:paddingRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_alignParentLeft="true"
android:textSize="20sp" android:text="@string/wifi_ssid"
android:gravity="left|center_vertical" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
android:gravity="left|center_vertical" />
<FrameLayout android:id="@+id/ssid_layout" <FrameLayout
android:layout_width="wrap_content" android:id="@+id/ssid_layout"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_alignBottom="@id/ssid_text" android:layout_height="wrap_content"
android:layout_toRightOf="@id/ssid_text"> android:layout_alignBottom="@id/ssid_text"
<EditText android:id="@+id/ssid" android:layout_toRightOf="@id/ssid_text">
android:layout_width="368dip" <EditText
android:layout_height="wrap_content" android:id="@+id/ssid"
android:singleLine="true" android:layout_width="368dip"
android:inputType="textNoSuggestions" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"
android:textSize="20sp" /> android:inputType="textNoSuggestions"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</FrameLayout> </FrameLayout>
</TableRow> </TableRow>
<TableRow android:id="@+id/security_fields" <TableRow
android:minHeight="56dip" android:id="@+id/security_fields"
android:visibility="gone"> android:minHeight="56dip"
<TextView android:id="@+id/password_text" android:visibility="gone">
android:layout_width="wrap_content" <TextView
android:minWidth="128dip" android:id="@+id/password_text"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:minHeight="56dip" android:minWidth="128dip"
android:text="@string/wifi_password" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:minHeight="56dip"
android:textSize="20sp" android:text="@string/wifi_password"
android:gravity="left|center_vertical" /> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
android:gravity="left|center_vertical" />
<LinearLayout android:id="@+id/password_layout" <LinearLayout
android:layout_width="wrap_content" android:id="@+id/password_layout"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="bottom"> android:layout_height="wrap_content"
<EditText android:id="@+id/password" android:gravity="bottom">
android:layout_width="368dip" <EditText
android:layout_height="wrap_content" android:id="@+id/password"
android:minHeight="56dip" android:layout_width="368dip"
android:singleLine="true" android:layout_height="wrap_content"
android:password="true" android:minHeight="56dip"
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"
android:textSize="20sp" /> android:password="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</LinearLayout> </LinearLayout>
<!-- It looks CheckBox isn't aligned well with TableRow --> <!-- It looks CheckBox isn't aligned well with TableRow -->
<FrameLayout android:layout_width="wrap_content" <FrameLayout
android:layout_height="wrap_content"> android:layout_width="wrap_content"
<CheckBox android:id="@+id/show_password" android:layout_height="wrap_content">
android:layout_width="match_parent" <CheckBox
android:layout_height="wrap_content" android:id="@+id/show_password"
android:minHeight="56dip" android:layout_width="match_parent"
android:text="@string/wifi_show_password" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:minHeight="56dip"
android:textSize="20sp" /> android:text="@string/wifi_show_password"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" />
</FrameLayout> </FrameLayout>
</TableRow> </TableRow>
<TableRow android:id="@+id/type_security" <TableRow
android:minHeight="56dip" android:id="@+id/type_security"
android:visibility="gone"> android:minHeight="56dip"
<TextView android:id="@+id/security_text" android:visibility="gone">
android:layout_width="wrap_content" <TextView
android:minWidth="128dip" android:id="@+id/security_text"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:minHeight="56dip" android:minWidth="128dip"
android:text="@string/wifi_security" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:minHeight="56dip"
android:textSize="20sp" android:text="@string/wifi_security"
android:gravity="bottom"/> android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
android:gravity="bottom"/>
<FrameLayout android:layout_width="wrap_content" <FrameLayout
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:gravity="bottom"> android:layout_height="wrap_content"
<Spinner android:id="@+id/security" android:gravity="bottom">
android:layout_width="368dip" <Spinner
android:layout_height="wrap_content" android:id="@+id/security"
android:minHeight="56dip" android:layout_width="368dip"
android:paddingLeft="4dip"/> android:layout_height="wrap_content"
android:minHeight="56dip"
android:paddingLeft="4dip"/>
</FrameLayout> </FrameLayout>
</TableRow> </TableRow>
</TableLayout> </TableLayout>