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

am afa6361d: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev

Browse Source 
* commit 'afa6361d36f522b4361c4a91a33edd39d322363a':
  Fix scrolling issue for Wifi hotspot setup layout.
This commit is contained in:
Sanket Padawe
2015-06-01 22:34:20 +00:00
committed by Android Git Automerger
parent 3974d3d4e6 afa6361d36
commit 64ec386837
1 changed files with 73 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
res/layout/wifi_ap_dialog.xml
View File

@@ -27,92 +27,112 @@
<LinearLayout android:id="@+id/info" <LinearLayout android:id="@+id/info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_section" />
android:orientation="vertical" />
<LinearLayout android:id="@+id/type" <LinearLayout android:id="@+id/type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_section"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item">
android:layout_marginTop="8dip" <TextView
android:text="@string/wifi_ssid" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:layout_marginTop="8dip"
android:text="@string/wifi_ssid" />
<EditText android:id="@+id/ssid" <EditText android:id="@+id/ssid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_ssid_hint" android:hint="@string/wifi_ssid_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="32" /> android:maxLength="32" />
</LinearLayout>
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item">
android:layout_marginTop="8dip" <TextView
android:text="@string/wifi_security" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:layout_marginTop="8dip"
android:text="@string/wifi_security" />
<Spinner android:id="@+id/security" <Spinner android:id="@+id/security"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:prompt="@string/wifi_security" android:prompt="@string/wifi_security"
android:entries="@array/wifi_ap_security" /> android:entries="@array/wifi_ap_security" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/fields" <LinearLayout android:id="@+id/fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_section"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item">
android:layout_marginTop="8dip" <TextView
android:text="@string/wifi_password" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:layout_marginTop="8dip"
android:text="@string/wifi_password" />
<EditText android:id="@+id/password" <EditText android:id="@+id/password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:password="true" android:password="true"
android:maxLength="63" android:maxLength="63"
android:imeOptions="flagForceAscii" /> android:imeOptions="flagForceAscii" />
</LinearLayout>
<TextView android:id="@+id/hint" <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item">
android:text="@string/credentials_password_too_short" <TextView android:id="@+id/hint"
android:layout_marginTop="8dip" android:layout_width="match_parent"
android:layout_marginBottom="10sp"/> android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:text="@string/credentials_password_too_short"
android:layout_marginTop="8dip"
android:layout_marginBottom="10sp"/>
<CheckBox android:id="@+id/show_password" <CheckBox android:id="@+id/show_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:text="@string/wifi_show_password" /> android:text="@string/wifi_show_password" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/fields" <LinearLayout android:id="@+id/fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_section" >
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -125,6 +145,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:prompt="@string/wifi_ap_band_config" /> android:prompt="@string/wifi_ap_band_config" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>