diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-06 17:40:43 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-06 17:40:43 +0100 |
| commit | 8bc386657e4bd582ea0897410523e27230a8e157 (patch) | |
| tree | 5850aeac08fed40710b4db0e5f8e8bf03da3a63a /core/res | |
| parent | df6d6764259f800d0a57452ecd487a0643d5dde1 (diff) | |
| parent | ab0b7afb26a80f5af609ccc5fb68e05a97fec901 (diff) | |
| download | frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.zip frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.tar.gz frameworks_base-8bc386657e4bd582ea0897410523e27230a8e157.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0replicant-6.0-alpha-0003replicant-6.0-alpha-0002
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/cm_strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/cm_symbols.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml index a77d370..a48e9e5 100644 --- a/core/res/res/values/cm_strings.xml +++ b/core/res/res/values/cm_strings.xml @@ -185,7 +185,7 @@ <string name="app_ops_start_at_bootup">start at power up</string> <string name="app_ops_toast_window">display toast messages</string> <string name="app_ops_toggle_bluetooth">toggle Bluetooth</string> - <string name="app_ops_toggle_mobile_data">toggle mobile data</string> + <string name="app_ops_toggle_mobile_data">toggle cellular data</string> <string name="app_ops_toggle_nfc">toggle NFC</string> <string name="app_ops_toggle_wifi">toggle Wi-Fi</string> <string name="app_ops_use_alarm_volume">control alarm volume</string> @@ -249,4 +249,8 @@ <!-- Protected Apps Notification --> <string name="notify_package_component_protected_title">Activity launch blocked</string> <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> is protected from being launched. Tap to authenticate and launch the application.</string> + + <!-- Battery fully charged notification --> + <string name="notify_battery_fully_charged_title">Battery fully charged</string> + <string name="notify_battery_fully_charged_text">Disconnect your device from the charger to improve battery longevity.</string> </resources> diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml index 5938060..4c24573 100644 --- a/core/res/res/values/cm_symbols.xml +++ b/core/res/res/values/cm_symbols.xml @@ -157,4 +157,9 @@ <!-- Restricted fingerprint config --> <java-symbol type="bool" name="config_fingerprintRestrictedToSystemAndOwner" /> + <!-- Show battery fully charged notification --> + <java-symbol type="bool" name="config_showBatteryFullyChargedNotification" /> + <java-symbol type="string" name="notify_battery_fully_charged_title" /> + <java-symbol type="string" name="notify_battery_fully_charged_text" /> + </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d153f88..7aa778b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2524,4 +2524,7 @@ automatically try to pair with it when the device exits tablet mode. --> <string translatable="false" name="config_packagedKeyboardName"></string> <integer name="config_dayColorTemperature">6500</integer> + + <!-- Show battery fully charged notification --> + <bool name="config_showBatteryFullyChargedNotification">false</bool> </resources> |