diff options
| author | Jason Monk <jmonk@google.com> | 2014-09-11 14:13:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 14:13:51 +0000 |
| commit | b01080dcd2b8ac5be7982268992d9fcc7f7c4610 (patch) | |
| tree | adba9059b02476c2844c97afd85cc8488f19930b /packages/SystemUI/res | |
| parent | 7377b576892f882eda11cc26cdb1ec8c428d9d5b (diff) | |
| parent | 4534e26cc16e89900c7b405e4bc2d70532a5fe60 (diff) | |
| download | frameworks_base-b01080dcd2b8ac5be7982268992d9fcc7f7c4610.zip frameworks_base-b01080dcd2b8ac5be7982268992d9fcc7f7c4610.tar.gz frameworks_base-b01080dcd2b8ac5be7982268992d9fcc7f7c4610.tar.bz2 | |
am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
Move zen mode constants and code to framework
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 147efaf..0445fe8 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -736,9 +736,6 @@ <!-- Shows when people have clicked at the right edge of the screen to explain how to open the phone. In right-to-left languages, this is the opposite direction. [CHAR LIMIT=60] --> <string name="camera_hint">Swipe left for camera</string> - <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] --> - <string name="zen_mode_forever">Indefinitely</string> - <!-- Interruption level: None. [CHAR LIMIT=20] --> <string name="interruption_level_none">None</string> @@ -805,18 +802,6 @@ <string name="user_add_user_message_short" msgid="1511354412249044381">When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users. </string> - <!-- Zen mode condition: time duration in minutes. [CHAR LIMIT=NONE] --> - <plurals name="zen_mode_duration_minutes"> - <item quantity="one">For one minute</item> - <item quantity="other">For %d minutes</item> - </plurals> - - <!-- Zen mode condition: time duration in hours. [CHAR LIMIT=NONE] --> - <plurals name="zen_mode_duration_hours"> - <item quantity="one">For one hour</item> - <item quantity="other">For %d hours</item> - </plurals> - <!-- Battery saver notification title. [CHAR LIMIT=60]--> <string name="battery_saver_notification_title">Battery saver is on</string> |