diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-13 21:29:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-13 21:29:58 +0000 |
| commit | 85a6db68f1860bbaacc1cc21e29c4f61aabe0abb (patch) | |
| tree | 24838dd8fc3109a7d4b1d563bd7534aea99998b4 | |
| parent | ee503da85d8c63924f1470baccb6e43c7313b5ae (diff) | |
| parent | 0fde868811f8f09b0c646b2851ed929c25251109 (diff) | |
Merge "Add config overlay flags for ActivityMode in Wear."
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d2194ba25029..cf7925baa578 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3311,4 +3311,9 @@ <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an empty string is passed in --> <string name="config_wlan_network_service_package" translatable="false"></string> + + <!-- Wear devices: Controls the radios affected by Activity Mode. --> + <string-array name="config_wearActivityModeRadios"> + <item>"wifi"</item> + </string-array> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index ca698ef2b55b..af253986577d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3254,4 +3254,7 @@ <java-symbol type="bool" name="config_keepRestrictedProfilesInBackground" /> <java-symbol type="array" name="config_ringtoneEffectUris" /> + + <!-- For Wear devices --> + <java-symbol type="array" name="config_wearActivityModeRadios" /> </resources> |