summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-04-20 17:49:10 -0700
committerDianne Hackborn <hackbod@google.com>2012-04-20 17:50:26 -0700
commit19caadc08f09cc9f6665fbbb0d61e02861ce8562 (patch)
treee614ceb22d936fb11c155511ed7419efd516442e /core/res
parente1a996e99dc68b48efad989876c01ce05a7a58ac (diff)
downloadframeworks_base-19caadc08f09cc9f6665fbbb0d61e02861ce8562.zip
frameworks_base-19caadc08f09cc9f6665fbbb0d61e02861ce8562.tar.gz
frameworks_base-19caadc08f09cc9f6665fbbb0d61e02861ce8562.tar.bz2
You can now long press on the power off menu to reboot to safe mode.
Change-Id: I3aa575285058cf5a3d89486d6b944f6ea13d645c
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/public.xml2
-rwxr-xr-xcore/res/res/values/strings.xml9
2 files changed, 11 insertions, 0 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 57a4b29..505c3f9 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 149a78c..f5cea9c 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