diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 | ||||
| -rw-r--r-- | res/values/themes.xml | 40 |
3 files changed, 44 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5323300..4ad76ce 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1274,6 +1274,8 @@ <string name="wifi_display_pause">Pause</string> <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] --> <string name="wifi_display_resume">Resume</string> + <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] --> + <string name="wifi_display_wps_config">WPS configuration</string> <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] --> <string name="wifi_display_listen_channel">Listen channel</string> <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] --> @@ -2400,8 +2402,8 @@ <string name="location_category_recent_location_requests">Recent location requests</string> <!-- Location settings screen, displayed when there's no recent app accessing location --> <string name="location_no_recent_apps">No apps have requested location in the last 15 minutes.</string> - <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services --> - <string name="location_category_location_services">Location services</string> + <!-- [CHAR LIMIT=30] Location settings screen, sub category for app settings --> + <string name="location_category_app_settings">App settings</string> <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use--> <string name="location_high_battery_use">High battery use</string> <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use--> diff --git a/res/values/styles.xml b/res/values/styles.xml index 96dcf21..adf406b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -82,11 +82,6 @@ <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge"> </style> - <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar"> - <item name="android:windowSoftInputMode">adjustPan</item> - <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> - </style> - <style name="PreferenceHeaderPanelSinglePane"> <item name="android:layout_marginStart">0dp</item> <item name="android:layout_marginEnd">0dp</item> diff --git a/res/values/themes.xml b/res/values/themes.xml index 805214f..b8b1ad2 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -15,9 +15,45 @@ --> <resources> + <attr name="ic_menu_add" format="reference" /> + <attr name="ic_menu_moreoverflow" format="reference" /> + <attr name="ic_wps" format="reference" /> + <attr name="wifi_signal" format="reference" /> + + <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar"> + <item name="android:windowSoftInputMode">adjustPan</item> + <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> + <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> + </style> + + <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar"> + <item name="android:windowSoftInputMode">adjustPan</item> + <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item> + <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item> + <item name="ic_menu_add">@drawable/ic_menu_add_light</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item> + <item name="ic_wps">@drawable/ic_wps_light</item> + <item name="wifi_signal">@drawable/wifi_signal_light</item> + </style> <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert"> <item name="android:windowSoftInputMode">adjustResize</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> + </style> + + <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert"> + <item name="android:windowSoftInputMode">adjustResize</item> + <item name="ic_menu_add">@drawable/ic_menu_add_light</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item> + <item name="ic_wps">@drawable/ic_wps_light</item> + <item name="wifi_signal">@drawable/wifi_signal_light</item> </style> <style name="Theme.Settings" parent="@android:style/Theme.Holo"> @@ -27,5 +63,9 @@ <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item> <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item> <item name="apnPreferenceStyle">@style/ApnPreference</item> + <item name="ic_menu_add">@drawable/ic_menu_add_dark</item> + <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item> + <item name="ic_wps">@drawable/ic_wps_dark</item> + <item name="wifi_signal">@drawable/wifi_signal_dark</item> </style> </resources> |