diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-11 03:47:09 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 16:58:39 -0800 |
| commit | 0e1dbed9194839a90755670d8fdf9046a75b85f7 (patch) | |
| tree | 010372762ddc617295da2862f7d61813da9e3586 /packages/SettingsLib/res/values | |
| parent | 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8 (diff) | |
| parent | e342181a4a8d8177b3b87ffe141777565fe98f15 (diff) | |
| download | frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.zip frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.gz frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 22
Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
Diffstat (limited to 'packages/SettingsLib/res/values')
| -rw-r--r-- | packages/SettingsLib/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 30 |
2 files changed, 33 insertions, 1 deletions
diff --git a/packages/SettingsLib/res/values/dimens.xml b/packages/SettingsLib/res/values/dimens.xml index 1c4b05f..3ad8f21 100644 --- a/packages/SettingsLib/res/values/dimens.xml +++ b/packages/SettingsLib/res/values/dimens.xml @@ -21,4 +21,6 @@ <!-- The translation for disappearing security views after having solved them. --> <dimen name="disappear_y_translation">-32dp</dimen> -</resources>
\ No newline at end of file + + <dimen name="circle_avatar_size">40dp</dimen> +</resources> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index c110321..bc1f16d 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -201,4 +201,34 @@ <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_wifi_signal_full">Wifi signal full.</string> + <!-- Label for kernel threads in battery usage --> + <string name="process_kernel_label">Android OS</string> + <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] --> + <string name="data_usage_uninstalled_apps">Removed apps</string> + <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] --> + <string name="data_usage_uninstalled_apps_users">Removed apps and users</string> + + <!-- Tethering controls, item title to go into the tethering settings --> + <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]--> + <string name="tether_settings_title_usb">USB tethering</string> + <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]--> + <string name="tether_settings_title_wifi">Portable hotspot</string> + <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]--> + <string name="tether_settings_title_bluetooth">Bluetooth tethering</string> + <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]--> + <string name="tether_settings_title_usb_bluetooth">Tethering</string> + <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]--> + <string name="tether_settings_title_all">Tethering & portable hotspot</string> + + <!-- Title for a work profile. [CHAR LIMIT=25] --> + <string name="managed_user_title">Work profile</string> + + <!-- Title for Guest user [CHAR LIMIT=35] --> + <string name="user_guest">Guest</string> + + <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.--> + <string name="unknown">Unknown</string> + + <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user --> + <string name="running_process_item_user_label">User: <xliff:g id="user_name">%1$s</xliff:g></string> </resources> |