diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-04-20 18:58:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 18:58:53 -0700 |
| commit | 8ff0c9204e565d7389b10495cf885c772d204be5 (patch) | |
| tree | f1aa6de8db6a70fbe95d2198b63c3edacb21ab43 /core/res | |
| parent | 7dc3d82a392696ede0757980cd68105682c46768 (diff) | |
| parent | 19caadc08f09cc9f6665fbbb0d61e02861ce8562 (diff) | |
| download | frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.zip frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.tar.gz frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.tar.bz2 | |
Merge "You can now long press on the power off menu to reboot to safe mode."
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index ac88669..05150fd 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -708,6 +708,8 @@ <java-symbol type="string" name="preposition_for_time" /> <java-symbol type="string" name="progress_erasing" /> <java-symbol type="string" name="progress_unmounting" /> + <java-symbol type="string" name="reboot_safemode_confirm" /> + <java-symbol type="string" name="reboot_safemode_title" /> <java-symbol type="string" name="relationTypeAssistant" /> <java-symbol type="string" name="relationTypeBrother" /> <java-symbol type="string" name="relationTypeChild" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 04866b9..9546a10 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -315,6 +315,15 @@ power off dialog instead of the global actions menu. --> <string name="shutdown_confirm_question">Do you want to shut down?</string> + <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] --> + <string name="reboot_safemode_title">Reboot to safe mode</string> + + <!-- Shutdown Confirmation Dialog. Message in the confirmation dialog + when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] --> + <string name="reboot_safemode_confirm">Do you want to reboot into safe mode? + This will disable all third party applications you have installed. + They will be restored when you reboot again.</string> + <!-- Recent Tasks dialog: title TODO: this should move to SystemUI.apk, but the code for the old recent dialog is still in the framework |