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

Merge "Add icons for Wi-Fi wakeup and notification settings toggles."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-21 23:04:30 +00:00
committed by Android (Google) Code Review
parent f8ecb13168 614e5c3e5c
commit 0113b65753
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/drawable/ic_settings_home.xml Normal file
View File

@@ -0,0 +1,25 @@
<!--
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?android:attr/colorControlNormal">
<path android:fillColor="#FFFFFFFF"
android:pathData="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
<path android:pathData="M0 0h24v24H0z" />
</vector>

28
res/xml/wifi_configure_settings.xml
View File

@@ -15,24 +15,26 @@
--> -->
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/wifi_configure_titlebar"> android:title="@string/wifi_configure_titlebar">
<SwitchPreference <SwitchPreference
android:key="enable_wifi_wakeup" android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup" android:title="@string/wifi_wakeup"
android:icon="@drawable/ic_settings_home"
android:summary="@string/wifi_wakeup_summary" /> android:summary="@string/wifi_wakeup_summary" />
<SwitchPreference <SwitchPreference
android:key="notify_open_networks" android:key="notify_open_networks"
android:title="@string/wifi_notify_open_networks" android:title="@string/wifi_notify_open_networks"
android:summary="@string/wifi_notify_open_networks_summary" /> android:icon="@drawable/ic_settings_notifications"
android:summary="@string/wifi_notify_open_networks_summary" />
<SwitchPreference <SwitchPreference
android:key="wifi_cellular_data_fallback" android:key="wifi_cellular_data_fallback"
android:title="@string/wifi_cellular_data_fallback_title" android:title="@string/wifi_cellular_data_fallback_title"
android:summary="@string/wifi_cellular_data_fallback_summary"/> android:summary="@string/wifi_cellular_data_fallback_summary"/>
<ListPreference <ListPreference
android:key="sleep_policy" android:key="sleep_policy"
@@ -51,10 +53,10 @@
</Preference> </Preference>
<Preference <Preference
android:key="wifi_calling_settings" android:key="wifi_calling_settings"
android:title="@string/wifi_calling_settings_title" android:title="@string/wifi_calling_settings_title"
android:fragment="com.android.settings.WifiCallingSettings" android:fragment="com.android.settings.WifiCallingSettings"
settings:keywords="@string/keywords_wifi_calling"/> settings:keywords="@string/keywords_wifi_calling"/>
<Preference <Preference
android:key="wifi_direct" android:key="wifi_direct"