am 4d4ccc9a: am 9db5ee35: Add facility to disable system packages.

Merge commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f'

* commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f':
  Add facility to disable system packages.
This commit is contained in:
Dianne Hackborn
2010-07-26 12:29:38 -07:00
committed by Android Git Automerger
4 changed files with 128 additions and 33 deletions

View File

@@ -1697,6 +1697,10 @@
<string name="data_size_label">Data</string>
<!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
<string name="uninstall_text">Uninstall</string>
<!-- Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
<string name="disable_text">Disable</string>
<!-- Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
<string name="enable_text">Enable</string>
<!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
<string name="clear_user_data_text">Clear data</string>
<!-- Manage applications, restore updated system application to factory version -->
@@ -1731,6 +1735,8 @@
<!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. -->
<string name="filter_apps_onsdcard">On SD card</string>
<!-- Manage applications, text telling using an application is disabled. -->
<string name="disabled">Disabled</string>
<string name="loading">Loading\u2026</string>
<!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
<string name="recompute_size">Recomputing size\u2026</string>
@@ -1784,7 +1790,7 @@ found in the list of installed applications.</string>
<string name="force_stop_dlg_title">Force stop</string>
<!-- Manage applications, text for dialog when killing persistent apps-->
<string name="force_stop_dlg_text">This application will be restarted right way. Are you sure you want to force stop?</string>
<string name="force_stop_dlg_text">Force stopping an application can cause it to misbehave. Are you sure?</string>
<!-- Manage applications, text for dialog when moving an app -->
<string name="move_app_failed_dlg_title">Move application</string>
<!-- Manage applications, text for dialog moving an app -->