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

Merge "Update add network dialog to not make networks hidden by default" into pi-dev am: 9dc3f74ccf

Browse Source 
am: e36aafd230

Change-Id: I1899e6d309bdb6c997cc9846742623cb272a8aab
This commit is contained in:
Salvador Martinez
2018-03-31 07:43:17 +00:00
committed by android-build-merger
parent a90332397b e36aafd230
commit 0f9a6d439f
5 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout/wifi_dialog.xml
View File

@@ -15,6 +15,7 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_scrollview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fadeScrollbars="false"
@@ -600,6 +601,33 @@
android:checked="true" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/hidden_settings_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView android:id="@+id/hidden_settings_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:text="@string/wifi_hidden_network" />
<Spinner android:id="@+id/hidden_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_spinner"
android:prompt="@string/wifi_hidden_network"
android:entries="@array/wifi_hidden_entries"/>
<TextView android:id="@+id/hidden_settings_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/wifi_hidden_network_warning"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

5
res/values/arrays.xml
View File

@@ -1075,6 +1075,11 @@
<item>Treat as unmetered</item>
</string-array>
<string-array name="wifi_hidden_entries">
<item>No</item>
<item>Yes</item>
</string-array>
<string-array name="wifi_metered_values" translatable="false">
<item>0</item>
<item>1</item>

2
res/values/strings.xml
View File

@@ -1936,7 +1936,7 @@
<!-- Label for the hidden network status of this network -->
<string name="wifi_hidden_network">Hidden network</string>
<!-- Label for the warning shown to users if they try to connect to a network as "hidden" -->
<string name="wifi_hidden_network_warning">Hidden network might create privacy risk as this device has to broadcast this SSID name in order to connect.</string>
<string name="wifi_hidden_network_warning">If your router is not broadcasting a network ID but you would like to connect to it in the future, you can set the network as hidden.\n\nThis may create a security risk because your phone will regularly broadcast its signal to find the network.\n\nSetting the network as hidden will not change your router settings.</string>
<!-- Label for the signal strength of the connection -->
<string name="wifi_signal">Signal strength</string>
<!-- Label for the status of the connection -->