am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. (32ce9484) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_ap_dialog.xml

+15 −9

Original line number	Diff line number	Diff line
		@@ -16,50 +16,54 @@

		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="300sp"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:fadeScrollbars="false">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="8dip"
		android:orientation="vertical">

		<LinearLayout android:id="@+id/info"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item"
		android:orientation="vertical" />

		<LinearLayout android:id="@+id/type"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		style="?android:attr/textAppearanceSmall"
		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"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_edit_content"
		android:singleLine="true"
		android:hint="@string/wifi_ssid_hint"
		android:inputType="textNoSuggestions"
		android:maxLength="32" />

		<TextView
		style="?android:attr/textAppearanceSmall"
		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"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_content"
		android:prompt="@string/wifi_security"
		android:entries="@array/wifi_ap_security" />
		</LinearLayout>
		@@ -67,36 +71,38 @@
		<LinearLayout android:id="@+id/fields"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item"
		android:orientation="vertical"
		android:visibility="gone">

		<TextView
		style="?android:attr/textAppearanceSmall"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="4dip"
		style="@style/wifi_item_label"
		android:layout_marginTop="8dip"
		android:text="@string/wifi_password" />

		<EditText android:id="@+id/password"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_edit_content"
		android:singleLine="true"
		android:password="true"
		android:maxLength="63"
		android:imeOptions="flagForceAscii" />

		<TextView android:id="@+id/hint"
		style="?android:attr/textAppearanceSmall"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textSize="12sp"
		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"
		style="?android:attr/textAppearanceSmall"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_content"
		android:text="@string/wifi_show_password" />
		</LinearLayout>
		</LinearLayout>

res/layout/wifi_dialog.xml

+181 −27

File changed.

Preview size limit exceeded, changes collapsed.

res/layout/wifi_dialog_row.xml

+9 −5

Original line number	Diff line number	Diff line
		@@ -15,15 +15,19 @@
		-->

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item" >
		<TextView
		<TextView android:id="@+id/name"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/wifi_item_label"
		android:id="@+id/name"
		android:textAlignment="viewStart" />

		<TextView
		android:id="@+id/value"
		style="@style/wifi_item_content"
		<TextView android:id="@+id/value"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_label"
		android:textStyle="bold"
		android:textAlignment="viewStart" />
		</LinearLayout>

res/values-land/styles.xml

+34 −0

Original line number	Diff line number	Diff line
		@@ -18,4 +18,38 @@
		<style name="KeyguardAppWidgetItem">
		<item name="android:textSize">16sp</item>
		</style>

		<style name="wifi_item">
		<item name="android:layout_marginTop">8dip</item>
		<item name="android:layout_marginStart">8dip</item>
		<item name="android:layout_marginEnd">8dip</item>
		<item name="android:paddingStart">8dip</item>
		<item name="android:paddingEnd">8dip</item>
		<item name="android:orientation">vertical</item>
		<item name="android:gravity">start</item>
		</style>

		<style name="wifi_item_label">
		<item name="android:paddingStart">8dip</item>
		<item name="android:textSize">14sp</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
		</style>

		<style name="wifi_item_content">
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
		<item name="android:textColor">@*android:color/primary_text_default_material_light</item>
		</style>

		<style name="wifi_item_edit_content">
		<item name="android:paddingStart">4dip</item>
		<item name="android:layout_marginStart">4dip</item>
		<item name="android:textSize">18sp</item>
		</style>

		<style name="wifi_section">
		<item name="android:orientation">vertical</item>
		</style>
		</resources>

res/values-sw600dp-land/styles.xml

+34 −0

Original line number	Diff line number	Diff line
		@@ -18,4 +18,38 @@
		<style name="KeyguardAppWidgetItem">
		<item name="android:textSize">18sp</item>
		</style>

		<style name="wifi_item">
		<item name="android:layout_marginTop">8dip</item>
		<item name="android:layout_marginStart">8dip</item>
		<item name="android:layout_marginEnd">8dip</item>
		<item name="android:paddingStart">8dip</item>
		<item name="android:paddingEnd">8dip</item>
		<item name="android:orientation">vertical</item>
		<item name="android:gravity">start</item>
		</style>

		<style name="wifi_item_label">
		<item name="android:paddingStart">8dip</item>
		<item name="android:textSize">14sp</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
		</style>

		<style name="wifi_item_content">
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
		<item name="android:textColor">@*android:color/primary_text_default_material_light</item>
		</style>

		<style name="wifi_item_edit_content">
		<item name="android:paddingStart">4dip</item>
		<item name="android:layout_marginStart">4dip</item>
		<item name="android:textSize">18sp</item>
		</style>

		<style name="wifi_section">
		<item name="android:orientation">vertical</item>
		</style>
		</resources>