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

am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev

Browse Source 
* commit 'c01754bac9dffb58221f418d0b8418862b43b117':
  Final UX for Wi-Fi assistant platform settings.
This commit is contained in:
Jeff Davidson
2014-11-15 00:21:59 +00:00
committed by Android Git Automerger
parent d099aa62ef c01754bac9
commit 0ae8d5caa8
6 changed files with 111 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -1451,10 +1451,12 @@
<string name="wifi_scan_always_available_title">Always allow scanning</string>
<!-- Checkbox summary for option to toggle scan always available setting -->
<string name="wifi_scan_always_available_summary">Let Google\'s location service and other apps scan for networks, even when Wi\u2011Fi is off</string>
<!-- Checkbox title for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=40] -->
<string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string>
<!-- Checkbox summary for option to Automatically manage Wi\u2011Fi [CHAR LIMIT=100] -->
<string name="wifi_automatically_manage_summary">Let <xliff:g id="wifi_assistant">%1$s</xliff:g> manage your Wi\u2011Fi connection</string>
<!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
<string name="wifi_automatically_connect_title">Connect to open Wi\u2011Fi automatically</string>
<!-- Checkbox summary for option to connect to open Wi-Fi automatically [CHAR LIMIT=100] -->
<string name="wifi_automatically_connect_summary">Allow a Wi\u2011Fi assistant to automatically rate and connect to open Wi\u2011Fi networks determined to be high quality</string>
<!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
<string name="wifi_select_assistant_dialog_title">Select a Wi\u2011Fi assistant</string>
<!-- Preference title for option to install certificates -->
<string name="wifi_install_credentials">Install certificates</string>
<string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>

5
res/values/styles.xml
View File

@@ -312,6 +312,10 @@
<item name="android:layout">@layout/apn_preference_layout</item>
</style>
<style name="AppListSwitchPreference" parent="@*android:style/Preference.Material.DialogPreference">
<item name="android:widgetLayout">@*android:layout/preference_widget_switch</item>
</style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium">
</style>
@@ -341,5 +345,4 @@
<style name="Widget.TimePicker" parent="@*android:style/Widget.Material.Light.TimePicker">
<item name="@android:numbersBackgroundColor">@android:color/white</item>
</style>
</resources>

12
res/xml/wifi_advanced_settings.xml
View File

@@ -30,11 +30,6 @@
android:summary="@string/wifi_scan_always_available_summary"
android:persistent="false" />
<SwitchPreference
android:key="wifi_assistant"
android:title="@string/wifi_automatically_manage_title"
android:persistent="false" />
<ListPreference
android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title"
@@ -42,6 +37,13 @@
android:entries="@array/wifi_sleep_policy_entries"
android:entryValues="@array/wifi_sleep_policy_values" />
<com.android.settings.AppListSwitchPreference
android:key="wifi_assistant"
android:title="@string/wifi_automatically_connect_title"
android:summary="@string/wifi_automatically_connect_summary"
android:dialogTitle="@string/wifi_select_assistant_dialog_title"
android:persistent="false" />
<ListPreference
android:key="frequency_band"
android:title="@string/wifi_setting_frequency_band_title"